diff options
| author | Martijn Coenen <maco@google.com> | 2015-10-19 14:54:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-19 14:54:36 +0000 |
| commit | 3f3788f005c118a651a2fba3126e85b793e118e5 (patch) | |
| tree | b636aff16cf48ef288ca24d2b94791b1e9093e73 | |
| parent | aca3f1c8ca0385b1736b1f3db80ce5abbe4798eb (diff) | |
| parent | f08a81c4607350683f2061f0fcf6421f01440175 (diff) | |
| download | android_packages_apps_Nfc-3f3788f005c118a651a2fba3126e85b793e118e5.tar.gz android_packages_apps_Nfc-3f3788f005c118a651a2fba3126e85b793e118e5.tar.bz2 android_packages_apps_Nfc-3f3788f005c118a651a2fba3126e85b793e118e5.zip | |
am f08a81c4: Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-dev am: 4aa62e3910
* commit 'f08a81c4607350683f2061f0fcf6421f01440175':
Don't enable reader mode when NFC is disabled.
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index a7a7a506..b822afe2 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -936,6 +936,10 @@ public class NfcService implements DeviceHostListener { public void setReaderMode(IBinder binder, IAppCallback callback, int flags, Bundle extras) throws RemoteException { synchronized (NfcService.this) { + if (!isNfcEnabled()) { + Log.e(TAG, "setReaderMode() called while NFC is not enabled."); + return; + } if (flags != 0) { try { mReaderModeParams = new ReaderModeParams(); |