diff options
| author | Suhas Suresh <suhas.suresh_1@nxp.com> | 2017-11-06 18:48:14 +0530 |
|---|---|---|
| committer | nxpandroid <srikrishna.pramoda@nxp.com> | 2017-11-16 09:47:37 +0530 |
| commit | d8a71d2a82af02ffd52675e1d37bfab89a51fbbf (patch) | |
| tree | 863726c363fa878dd8fecbd6513d0953cdaac6a7 | |
| parent | 6e22d113a6929208f302f0f833663f141a51e09a (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-d8a71d2a82af02ffd52675e1d37bfab89a51fbbf.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-d8a71d2a82af02ffd52675e1d37bfab89a51fbbf.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-d8a71d2a82af02ffd52675e1d37bfab89a51fbbf.zip | |
Fix for HCE F failure
1.Corrected Wrong screen State check in enableDiscovery in case of
enable p2pListening.
2.Corrected set screen state and Discovery sequence in NfcService
| -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 { |