1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 4d351b9a..365b9760 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1277,6 +1277,11 @@ public class NfcService implements DeviceHostListener {
         @Override
         public boolean setNfcSecure(boolean enable) {
             NfcPermissions.enforceAdminPermissions(mContext);
+            if(mKeyguard.isKeyguardLocked() && !enable) {
+                Log.i(TAG, "KeyGuard need to be unlocked before setting Secure NFC OFF");
+                return false;
+            }
+
             synchronized (NfcService.this) {
                 Log.i(TAG, "setting Secure NFC " + enable);
                 mPrefsEditor.putBoolean(PREF_SECURE_NFC_ON, enable);