diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2017-07-21 17:15:49 -0700 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-07-21 17:29:55 -0700 |
| commit | 4baefd141b5222f009ecc872ce25e3eafdbf682e (patch) | |
| tree | 107ddadf509c7aecaf5673d0fc73f04d370ae99e | |
| parent | f09a03acb66945e85a8c7ce1b5dc346904080dab (diff) | |
| download | android_packages_apps_Nfc-4baefd141b5222f009ecc872ce25e3eafdbf682e.tar.gz android_packages_apps_Nfc-4baefd141b5222f009ecc872ce25e3eafdbf682e.tar.bz2 android_packages_apps_Nfc-4baefd141b5222f009ecc872ce25e3eafdbf682e.zip | |
Reader Mode should disable HCE
Reader mode allows only reading/writing tags. This patch disables HCE
when reader mode is enabled.
Bug: 63774296
Test: Enable reader mode and test HCE
Change-Id: Iaa9df97f14674fc308b7b7b3cd3d9b3ca1992c74
(cherry picked from commit a3a7a6cc33be55598f95f93ee8e0563a91e73dc7)
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 87c75ac6..e8c6bf73 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1724,8 +1724,8 @@ public class NfcService implements DeviceHostListener { paramsBuilder.setEnableP2p(false); } - if (mIsHceCapable && mScreenState >= ScreenStateHelper.SCREEN_STATE_ON_LOCKED) { - // Host routing is always enabled at lock screen or later + 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); } |