diff options
| author | nxf32288 <ganesh.deva_1@nxp.com> | 2017-10-24 13:33:24 +0530 |
|---|---|---|
| committer | nxpandroid <srikrishna.pramoda@nxp.com> | 2017-11-16 09:36:05 +0530 |
| commit | 1754ee0df13f110ab544744bb65f52a17301f230 (patch) | |
| tree | 62169b61602e564859d0fd7fc855bdf6f9c7e5da | |
| parent | 57a34d903fe90a1e33e9a413175f7e52af8140c1 (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-1754ee0df13f110ab544744bb65f52a17301f230.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-1754ee0df13f110ab544744bb65f52a17301f230.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-1754ee0df13f110ab544744bb65f52a17301f230.zip | |
NFCEE_MODE_SET_CMD to eSE disabled during NFC init in 6Xt.
Updated ALL_SE_ID_TYPE properly depends on chip type.
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 716cf4a4..58e88f5a 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1298,7 +1298,6 @@ public class NfcService implements DeviceHostListener { mNxpPrefs.getInt(PREF_SECURE_ELEMENT_ID, SECURE_ELEMENT_ID_DEFAULT); if (seList != null) { - if (secureElementId != ALL_SE_ID_TYPE/* SECURE_ELEMENT_ALL */) { mDeviceHost.doDeselectSecureElement(UICC_ID_TYPE); mDeviceHost.doDeselectSecureElement(UICC2_ID_TYPE); @@ -1461,8 +1460,8 @@ public class NfcService implements DeviceHostListener { watchDog.cancel(); } int chipVer = mDeviceHost.getChipVer(); - if((chipVer == PN80T_ID) || (chipVer == PN553_ID)) { - ALL_SE_ID_TYPE |= UICC2_ID_TYPE; + if(chipVer < PN553_ID) { + ALL_SE_ID_TYPE &= ~UICC2_ID_TYPE; } checkSecureElementConfuration(); |