commit 4aa62e3910cf5c3138fff937d5198946c01eccfc
author Martijn Coenen <maco@google.com> Mon Oct 19 14:48:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 19 14:48:53 2015 +0000
tree 569b1b6013a4764c5c7762f39490f7276705e854
parent e208aeb621783e51b8464232ee515bca2fa0135f
parent eee16964e9db2f60863de63d75dde41bbed4aed3

Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-dev

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index a7a7a50..b822afe 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -936,6 +936,10 @@
         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();