diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-21 03:12:45 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-21 03:12:45 +0000 |
| commit | c032802dca743fb31957e8702682d920c1d73f8f (patch) | |
| tree | 3bf3edf14fa97b417d3972acc75e760cd10d1dbd | |
| parent | 62f1871bc3ab5a854922daea2e53c70940aa18c4 (diff) | |
| parent | 2a4f688b3ae3b4151ab4aab8dfad81e8c2a2e7e4 (diff) | |
| download | platform_packages_apps_Nfc-pie-qpr1-s3-release.tar.gz platform_packages_apps_Nfc-pie-qpr1-s3-release.tar.bz2 platform_packages_apps_Nfc-pie-qpr1-s3-release.zip | |
Snap for 4966094 from 2a4f688b3ae3b4151ab4aab8dfad81e8c2a2e7e4 to pi-qpr1-releaseandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release
Change-Id: Ifd42b52264567ae6370fcc18ded5d073c0b2baa1
| -rw-r--r-- | src/com/android/nfc/NfcService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index d6d4fd13..feabd30e 100644 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1767,10 +1767,9 @@ public class NfcService implements DeviceHostListener { 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); } |