commit 38af880366697126f94f0ebc82365df7d42c56aa
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 19 17:50:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 19 17:50:31 2018 +0000
tree a9ef634179343141c57a81d2a43e88bde6d0b23b
parent e1a751e17a93d8815496895053a42d1b581daf49
parent e482ec1ed2e15922a26ceaad71dd6e2e552c6dd2

Merge "Fix Screen state change command going two times after reboot"

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index ced39a9..504d836 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1709,6 +1709,12 @@
       << StringPrintf("%s: state = %d prevScreenState= %d, discovry_param = %d",
                       __FUNCTION__, state, prevScreenState, discovry_param);
 
+  if (prevScreenState == state) {
+    DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+        "New screen state is same as previous state. No action taken");
+    return;
+  }
+
   if (sIsDisabling || !sIsNfaEnabled ||
       (NFC_GetNCIVersion() != NCI_VERSION_2_0))
     return;