diff options
| author | Benjamin Franz <bfranz@google.com> | 2014-10-15 17:55:03 +0100 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2014-10-15 17:55:03 +0100 |
| commit | 65860bb589c5802ffadb14540670408d6c8dfaa9 (patch) | |
| tree | 92384d10d1d5b11fc203d86d8869d3a0a6e6eee4 /src/com/android/nfc/NfcService.java | |
| parent | f6525245a348abb715233aa91994fd919f29e523 (diff) | |
| download | android_packages_apps_Nfc-65860bb589c5802ffadb14540670408d6c8dfaa9.tar.gz android_packages_apps_Nfc-65860bb589c5802ffadb14540670408d6c8dfaa9.tar.bz2 android_packages_apps_Nfc-65860bb589c5802ffadb14540670408d6c8dfaa9.zip | |
Reactivate Beam sharing for managed profiles.
Bug: 17916693
Change-Id: I41f2a0e45378365a0ef7c042067c85d234b1a00b
Diffstat (limited to 'src/com/android/nfc/NfcService.java')
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 3 |
1 files changed, 1 insertions, 2 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) { |