diff options
| author | Martijn Coenen <maco@google.com> | 2016-06-22 00:01:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 00:01:25 +0000 |
| commit | 3944ab418ef70c141e5932e1f716381dd65f9be6 (patch) | |
| tree | 486757e57bed819e93153f659388f2292ad9cdc8 | |
| parent | 339bd3a1ca14287f4d99994b9be6f0aae3605450 (diff) | |
| parent | 85c4e152648d0a4f51d7fe076e468dccb431e7e9 (diff) | |
| download | android_packages_apps_Nfc-3944ab418ef70c141e5932e1f716381dd65f9be6.tar.gz android_packages_apps_Nfc-3944ab418ef70c141e5932e1f716381dd65f9be6.tar.bz2 android_packages_apps_Nfc-3944ab418ef70c141e5932e1f716381dd65f9be6.zip | |
Merge \"Allow system_server access to NFC reader mode API.\" into nyc-dev
am: 85c4e15264
Change-Id: Idb2ea1dbb2ad3d4f32f3ed01e138e8d43330da6b
| -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 a5aa89a6..8411fb61 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -962,8 +962,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) { |