summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2016-06-21 11:13:50 +0200
committerThe Android Automerger <android-build@google.com>2016-06-23 15:06:41 -0700
commite1bc9bb08636ae758d74c6ca65fe0118fad4ed8d (patch)
tree0d6957754f3e4c995ed49df9a7fce885cb0fc1fb
parent9ea802b5456a36f1115549b645b65c791eff3c2c (diff)
downloadandroid_packages_apps_Nfc-e1bc9bb08636ae758d74c6ca65fe0118fad4ed8d.tar.gz
android_packages_apps_Nfc-e1bc9bb08636ae758d74c6ca65fe0118fad4ed8d.tar.bz2
android_packages_apps_Nfc-e1bc9bb08636ae758d74c6ca65fe0118fad4ed8d.zip
Allow system_server access to NFC reader mode API.
Bug: 29451566 Change-Id: I26b0a2e9b33854efd59b95ab230a6db3042f93c7
-rwxr-xr-xsrc/com/android/nfc/NfcService.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index d62ec03b..0be8bef4 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -938,8 +938,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) {