diff options
| author | Love Khanna <love.khanna@nxp.com> | 2017-07-12 18:12:12 +0530 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-07-17 23:45:22 +0000 |
| commit | 1227736a352797f6bebe7f4e098dab6a15f3164c (patch) | |
| tree | 3381275a40ad1c492526c2d9dcc5044e2876fbdf | |
| parent | fdcfcb0031a4fbf38dd828ac1b3ef8319342e2fa (diff) | |
| download | android_packages_apps_Nfc-1227736a352797f6bebe7f4e098dab6a15f3164c.tar.gz android_packages_apps_Nfc-1227736a352797f6bebe7f4e098dab6a15f3164c.tar.bz2 android_packages_apps_Nfc-1227736a352797f6bebe7f4e098dab6a15f3164c.zip | |
Power sub state and CON_DISC_PARAM seqence update.
While entering in to screen on unlock state, power sub state
should be notified to NFCC first, then CON_DISC_PARAM
should be configured to enable poll-listen phase.
Bug: 63146248
Test: Compiles.
Change-Id: I9a73881ef7537d4e0b1acb6582c3b6fe1823b5ec
(cherry picked from commit 8b3d6f833469e8359e310657339e1f1418cb36c4)
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 51fc0370..6d7d8114 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1014,6 +1014,8 @@ static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o) } } + prevScreenState = NFA_SCREEN_STATE_OFF_LOCKED; + // Do custom NFCA startup configuration. doStartupConfig(); goto TheEnd; @@ -1671,7 +1673,8 @@ static void nfcManager_doSetScreenState (JNIEnv* e, jobject o, jint screen_state if (sIsDisabling || !sIsNfaEnabled ||(NFC_GetNCIVersion() != NCI_VERSION_2_0)) return; - if (prevScreenState == NFA_SCREEN_STATE_OFF_LOCKED || prevScreenState == NFA_SCREEN_STATE_OFF_UNLOCKED) + if (prevScreenState == NFA_SCREEN_STATE_OFF_LOCKED || prevScreenState == NFA_SCREEN_STATE_OFF_UNLOCKED || + prevScreenState == NFA_SCREEN_STATE_ON_LOCKED) { SyncEventGuard guard (sNfaSetPowerSubState); status = NFA_SetPowerSubStateForScreenState(state); @@ -1716,7 +1719,7 @@ static void nfcManager_doSetScreenState (JNIEnv* e, jobject o, jint screen_state return; } - if (prevScreenState == NFA_SCREEN_STATE_ON_LOCKED || prevScreenState == NFA_SCREEN_STATE_ON_UNLOCKED) + if (prevScreenState == NFA_SCREEN_STATE_ON_UNLOCKED) { SyncEventGuard guard (sNfaSetPowerSubState); status = NFA_SetPowerSubStateForScreenState(state); |