commit c032802dca743fb31957e8702682d920c1d73f8f
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:12:45 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:12:45 2018 +0000
tree 3bf3edf14fa97b417d3972acc75e760cd10d1dbd
parent 62f1871bc3ab5a854922daea2e53c70940aa18c4
parent 2a4f688b3ae3b4151ab4aab8dfad81e8c2a2e7e4

Snap for 4966094 from 2a4f688b3ae3b4151ab4aab8dfad81e8c2a2e7e4 to pi-qpr1-release

Change-Id: Ifd42b52264567ae6370fcc18ded5d073c0b2baa1

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);
         }