diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:02:20 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:48 -0700 |
| commit | 72fb115e93267e89cf8d5eddcb990baa42d93fef (patch) | |
| tree | 0245ae9348aab2b909e01837c4d10f86d1e82dd1 | |
| parent | 018ec89d460f8b6389b4ffe787d293090dcc0bdd (diff) | |
| parent | e1bc9bb08636ae758d74c6ca65fe0118fad4ed8d (diff) | |
| download | android_packages_apps_Nfc-72fb115e93267e89cf8d5eddcb990baa42d93fef.tar.gz android_packages_apps_Nfc-72fb115e93267e89cf8d5eddcb990baa42d93fef.tar.bz2 android_packages_apps_Nfc-72fb115e93267e89cf8d5eddcb990baa42d93fef.zip | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: I7b6b664eab962509733953d0acf2b0c092d3c926
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 8dd44f33..e61b9f39 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -959,8 +959,9 @@ public class NfcService implements DeviceHostListener { @Override public void setReaderMode(IBinder binder, IAppCallback callback, int flags, Bundle extras) throws RemoteException { - if (!mForegroundUtils.isInForeground(Binder.getCallingUid())) { - Log.e(TAG, "setReaderMode: Caller not in foreground."); + int callingUid = Binder.getCallingUid(); + if (callingUid != Process.SYSTEM_UID && !mForegroundUtils.isInForeground(callingUid)) { + Log.e(TAG, "setReaderMode: Caller is not in foreground and is not system process."); return; } synchronized (NfcService.this) { |