diff options
| author | Ganesh Deva <ganesh.deva_1@nxp.com> | 2019-07-12 11:58:49 +0530 |
|---|---|---|
| committer | nxf24591 <nanjesh.s_1@nxp.com> | 2019-07-12 16:00:16 +0530 |
| commit | 7786636efe1fae635b04b70a0926917e9f3568cf (patch) | |
| tree | b8a8731ad8962433997c2604646dff89c9357da5 | |
| parent | f3ed041e4896be514118d1f128273ead5eec88d5 (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-7786636efe1fae635b04b70a0926917e9f3568cf.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-7786636efe1fae635b04b70a0926917e9f3568cf.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-7786636efe1fae635b04b70a0926917e9f3568cf.zip | |
{Q_AOSP}: Prevent SecureNfc disable if keyguard is locked
For better security, we do not want secure nfc could be disabled when
keyguard is still locked.
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 5 |
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); |