commit 1a5eef2682805a24d10d141916044a65084ea8be
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 25 19:58:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 25 19:58:22 2018 +0000
tree 4e9effa8fc3e9e571d2324dc956fa5f386573222
parent 38af880366697126f94f0ebc82365df7d42c56aa
parent 926547b6118ebd4ccff5489b6df1abedb9a1502a

Merge "Skip setEnableHostRouting when switching to screen off"

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index d6d4fd1..feabd30 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1767,10 +1767,9 @@
             paramsBuilder.setTechMask(techMask);
             paramsBuilder.setEnableLowPowerDiscovery(false);
             paramsBuilder.setEnableP2p(false);
-        } else {
         }
 
-        if (mIsHceCapable && mReaderModeParams == null) {
+        if (mIsHceCapable && mScreenState >= ScreenStateHelper.SCREEN_STATE_ON_LOCKED && mReaderModeParams == null) {
             // Host routing is always enabled at lock screen or later, provided we aren't in reader mode
             paramsBuilder.setEnableHostRouting(true);
         }