diff options
author | Martijn Coenen <maco@google.com> | 2016-05-23 09:13:57 +0200 |
---|---|---|
committer | Scott Mertz <scott@cyngn.com> | 2016-07-08 16:08:38 -0700 |
commit | e6615d503a6dc1143bbfa952ae70c20872084778 (patch) | |
tree | 60dc9012c3779f010a6750c01b50176b7b316308 | |
parent | 1de4026cc9550915440a4d1646050064b03ea029 (diff) | |
download | android_packages_apps_Nfc-e6615d503a6dc1143bbfa952ae70c20872084778.tar.gz android_packages_apps_Nfc-e6615d503a6dc1143bbfa952ae70c20872084778.tar.bz2 android_packages_apps_Nfc-e6615d503a6dc1143bbfa952ae70c20872084778.zip |
Verify setForegroundDispatch caller is in foreground.stable/cm-13.0-ZNH2KB
Bug: 28300969
Ticket: CYNGNOS-3020
Change-Id: Icadfe70cd06f921badd266e7a4efbae15a8c206a
(cherry picked from commit 0889ac84bd8325b41583033ac7597e020fd24600)
-rwxr-xr-x | src/com/android/nfc/NfcService.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 7ab83e5b..8dd44f33 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -826,7 +826,10 @@ public class NfcService implements DeviceHostListener { public void setForegroundDispatch(PendingIntent intent, IntentFilter[] filters, TechListParcel techListsParcel) { NfcPermissions.enforceUserPermissions(mContext); - + if (!mForegroundUtils.isInForeground(Binder.getCallingUid())) { + Log.e(TAG, "setForegroundDispatch: Caller not in foreground."); + return; + } // Short-cut the disable path if (intent == null && filters == null && techListsParcel == null) { mNfcDispatcher.setForegroundDispatch(null, null, null); @@ -956,6 +959,10 @@ 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."); + return; + } synchronized (NfcService.this) { if (!isNfcEnabled()) { Log.e(TAG, "setReaderMode() called while NFC is not enabled."); |