diff options
| author | Benjamin Franz <bfranz@google.com> | 2014-10-28 16:13:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 16:13:44 +0000 |
| commit | 03754119f6920b3016175f1e0bd3b4d9a7b51108 (patch) | |
| tree | a4462e01d72da1a7ca4170a6ed2e4eec2573f6cd | |
| parent | 6ad3ce2fcf1445e26069329ff83d29ea2c649cb7 (diff) | |
| parent | 65860bb589c5802ffadb14540670408d6c8dfaa9 (diff) | |
| download | android_packages_apps_Nfc-03754119f6920b3016175f1e0bd3b4d9a7b51108.tar.gz android_packages_apps_Nfc-03754119f6920b3016175f1e0bd3b4d9a7b51108.tar.bz2 android_packages_apps_Nfc-03754119f6920b3016175f1e0bd3b4d9a7b51108.zip | |
Merge "Reactivate Beam sharing for managed profiles." into lmp-mr1-dev
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 3 | ||||
| -rwxr-xr-x | src/com/android/nfc/P2pLinkManager.java | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index d8278833..6c2af257 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -805,8 +805,7 @@ public class NfcService implements DeviceHostListener { // don't allow Beam for managed profiles, or devices with a device owner or policy owner UserInfo userInfo = mUserManager.getUserInfo(UserHandle.getCallingUserId()); - if(!userInfo.isManagedProfile() - && !mUserManager.hasUserRestriction( + if(!mUserManager.hasUserRestriction( UserManager.DISALLOW_OUTGOING_BEAM, userInfo.getUserHandle())) { mP2pLinkManager.setNdefCallback(callback, Binder.getCallingUid()); } else if (DBG) { diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java index 487cd4e5..480d1d10 100755 --- a/src/com/android/nfc/P2pLinkManager.java +++ b/src/com/android/nfc/P2pLinkManager.java @@ -484,7 +484,7 @@ class P2pLinkManager implements Handler.Callback, P2pEventListener.Callback { String[] pkgs = mPackageManager.getPackagesForUid(foregroundUids.get(0)); if (pkgs != null && pkgs.length >= 1) { if (!generatePlayLink || beamDefaultDisabled(pkgs[0]) - || isManagedOrBeamDisabled(foregroundUids.get(0))) { + || isBeamDisabled(foregroundUids.get(0))) { if (DBG) Log.d(TAG, "Disabling default Beam behavior"); mMessageToSend = null; mUrisToSend = null; @@ -499,11 +499,10 @@ class P2pLinkManager implements Handler.Callback, P2pEventListener.Callback { } } - private boolean isManagedOrBeamDisabled(int uid) { + private boolean isBeamDisabled(int uid) { UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); UserInfo userInfo = userManager.getUserInfo(UserHandle.getUserId(uid)); - return userInfo.isManagedProfile() || - userManager.hasUserRestriction( + return userManager.hasUserRestriction( UserManager.DISALLOW_OUTGOING_BEAM, userInfo.getUserHandle()); } |