commit f09ee85a634da06d3ca7dfe6a7e0fe83092ab80d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 17 23:23:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 17 23:23:41 2017 +0000
tree c381882111ec2f8f7e183a3e8f793986b5afe898
parent 0edad4a88b6ba830a18106694a634455dbbd9ca3
parent 590900fa4b269a9b7f5a66c2e224b2f8e47ff081

Merge "Power sub state and CON_DISC_PARAM seqence update."

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 51fc037..6d7d811 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1014,6 +1014,8 @@
                     }
                 }
 
+                prevScreenState = NFA_SCREEN_STATE_OFF_LOCKED;
+
                 // Do custom NFCA startup configuration.
                 doStartupConfig();
                 goto TheEnd;
@@ -1671,7 +1673,8 @@
 
     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 @@
        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);