diff options
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 2 | ||||
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 8af2fbab..e387c782 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -2907,7 +2907,7 @@ static void nfcManager_enableDiscovery (JNIEnv* e, jobject o, jint technologies_ handle = SecureElement::getInstance().getEseHandleFromGenericId(SecureElement::UICC_ID); #if(NXP_EXTNS == TRUE) - if((getScreenState() == (NFA_SCREEN_STATE_ON_LOCKED)) || sProvisionMode) + if((getScreenState() == (NFA_SCREEN_STATE_ON_UNLOCKED)) || sProvisionMode) { ALOGV("%s: Enable p2pListening", __func__); PeerToPeer::getInstance().enableP2pListening (true); diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 58e88f5a..996903e9 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -5231,17 +5231,14 @@ public class NfcService implements DeviceHostListener { case MSG_APPLY_SCREEN_STATE: mScreenState = (int)msg.obj; - - if(mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) - { - applyRouting(false); - } int screen_state_mask = (mNfcUnlockManager.isLockscreenPollingEnabled()) ? (ScreenStateHelper.SCREEN_POLLING_TAG_MASK | mScreenState) : mScreenState; + mDeviceHost.doSetScreenOrPowerState(screen_state_mask); - if(mNfcUnlockManager.isLockscreenPollingEnabled()) + if(mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED + || mNfcUnlockManager.isLockscreenPollingEnabled()) { applyRouting(false); - mDeviceHost.doSetScreenOrPowerState(screen_state_mask); + } /* mRoutingWakeLock.acquire(); try { |