Merge branch 'nfc.vendor.lnx.2.0' into nfc.vendor.lnx.2.2

* nfc.vendor.lnx.2.0: (136 commits)
  NFC: Add fix for compilation issues
  Updated readme for - NFC_AR_00_6000_11.02.00_OpnSrc
  HIDL service implementation alignment with Pn8xT
  {QSSI} NxpNfc::resetEse(uint64_t resetType) api alignment.
  Copyright license update
  Android Q 10.00.13 patch integration [MPOS]: Support to enable lpcd during NFC init.
  Android Q 10.00.13 patch integration [MPOS]: Support configurable existing LPCD configuration. By default, the LPCD is disabled in EMVCO profile in latest FW. Hence,going forward, to be compatible with both the old & new FW, MW shall allow to configure this feature from libnfc-nxp.conf file.
  Android Q 10.00.13 patch integration Improvements on Fix for No MW recovery after Core reset notification The abort was triggered for all the status except CORE_RESET_TRIGGER_TYPE_CORE_RESET_CMD_RECEIVED. Now, GetConfig will be called to verify the EEPROM Configurations and later abort will be triggered only for the below mentioned status. 1. CORE_RESET_TRIGGER_TYPE_POWERED_ON: 2. NCI2_0_CORE_RESET_TRIGGER_TYPE_OVER_TEMPERATURE: 3. CORE_RESET_TRIGGER_TYPE_FW_ASSERT: 4. CORE_RESET_TRIGGER_TYPE_WATCHDOG_RESET: 5. CORE_RESET_TRIGGER_TYPE_INPUT_CLOCK_LOST: 6. CORE_RESET_TRIGGER_TYPE_UNRECOVERABLE_ERROR:
  Android Q 10.00.13 patch integration [COVERITY]: Resolved Coverity warnings.
  Android Q 10.00.13 patch integration Fix for No MW recovery after Core reset notification with recoverable error
  Android Q 10.00.13 patch integration [Recovery]: Fix for HAL init recovery failure 1) In case of init failure shall perform force FW download 2) Apply default settings after FW download sequence
  Android Q 10.00.13 patch integration [COVERITY]: Resolved Coverity warnings. Warnings Resolved: UNCAUGHT_EXCEPT.
  Android Q 10.00.13 patch integration [COVERITY]: Resolved Coverity warnings Warnings Resolved: SIZE_OF_MISMATCH, USE_AFTER_FREE.
  Android Q 10.00.13 patch integration Apply Clock Setting after RF Block command ISSUE : RF Block commands was overwriting clock configuration. FIX : Apply Clock Configration after RF Blocks command.
  Android Q 10.00.13 patch integration RF conf. update not executing Check FW download status flag also along with EEPROM value.
  Android Q 10.00.13 patch integration Add support to Mifare classic reader. The NFC MW shall support Mifare Classic Reader over eSE.
  {R-DP2} Fix warnings from static analysis tools(hal_nfc-1/2
  {R-DP2} Update cfg files search rule
  rework on api setEseUpdateState.
  NFC: Add dynamic config support for SM7250 variant
  ...

Change-Id: I81958b94d4666a03a099cf195463526c9205172a
tree: 7f9f906d02aac946bdc4054f594a262d1262086f
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. inc/
  6. jcos_client/
  7. ls_client/
  8. SN100x/
  9. src/
  10. utils/
  11. Android.bp
  12. MODULE_LICENSE_APACHE2
  13. nfc_vendor_product.mk
  14. NOTICE
  15. OWNERS
  16. PREUPLOAD.cfg
  17. README.md
  18. README.md~
  19. run_unit_tests.sh
README.md

nfcandroid_nxp_ese_clients

This Repo contains any additional information/files required to support the release

####Git Repository

DESCRIPTIONCHECKOUT COMMAND
nfcandroid_nxp_ese_clientsgit clone https://github.com/NXPNFCProject/nfcandroid_nxp_ese_clients.git

####Supported Versions on "master" Branch

Android VersionNXP ReleaseNXP Tag
android-p-preview 29.00.08 (SN100x)NFC_NCIHALx_AR2000.09.00.08_OpnSrc
android-p-preview 29.00.0A (SN100x)NFC_NCIHALx_AR2000.09.00.0A_OpnSrc
android-p-preview 29.00.0C (SN100x)NFC_NCIHALx_AR2000.09.00.0C_OpnSrc
android-p-preview 29.00.0D (SN100x)NFC_NCIHALx_AR2000.09.00.0D_OpnSrc
android-p-preview 29.00.0F (SN100x)NFC_NCIHALx_AR2000.09.00.0F_OpnSrc
android-p-preview 29.00.11 (SN100x)NFC_NCIHALx_AR2000.09.00.11_OpnSrc
android-p-preview 29.00.13 (SN100x)NFC_NCIHALx_AR2000.09.00.13_OpnSrc

#NFC_NCIHAL_libnfc-nci

Git Repository

DESCRIPTIONCHECKOUT COMMAND
NFC_NCIHAL_libnfc-ncigit clone https://github.com/NXPNFCProject/NFC_NCIHAL_libnfc-nci.git

####Supported Versions on "master" Branch

Android VersionNXP ReleaseNXP Tag
android-5.0.0_r1/android5.1.0_r13.5.0_L (PN547C2/PN548C2)NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc

####Supported Versions on "br_android_ncihalx_m" Branch

Android VersionNXP ReleaseNXP Tag
android-6.0.0_r14.2.0_M (PN547C2/PN548C2)NFC_NCIHALx_AR0F.4.2.0_M_OpnSrc
android-6.0.0_r14.3.0_M (PN547C2/PN548C2)NFC_NCIHALx_AR0F.4.3.0_M_OpnSrc
android-6.0.1_r174.5.0_M (PN551/PN548C2)NFC_NCIHALx_AR3C.4.5.0_M_OpnSrc
android-6.0.1_r174.7.0_M (PN553)NFC_NCIHALx_ARC0.4.7.0_M_OpnSrc
android-6.0.1_r174.8.0_M (PN551/PN548C2)NFC_NCIHALx_AR3C.4.8.0_M_OpnSrc

####Supported Versions on "br_android_ncihalx_n" Branch

Android VersionNXP ReleaseNXP Tag
android-7.0.0_r17.0.3_N (PN548C2/PN551)NFC_NCIHALx_AR3C.7.0.3_N_OpnSrc
android-7.0.0_r47.0.4_N (PN553)NFC_NCIHALx_ARC0.7.0.4_N_OpnSrc
android-7.0.0_r127.1.0_N (PN548C2/PN551/PN553)NFC_NCIHALx_ARFC.7.1.0_N_OpnSrc
android-7.0.0_r127.2.0_N (PN553)NFC_NCIHALx_ARC0.7.2.0_N_OpnSrc
android-7.0.0_r127.3.0_N (PN553)NFC_NCIHALx_ARC0.7.3.0_N_OpnSrc
android-7.1.1_r17.4.0_N (PN548C2/PN551)NFC_NCIHALx_AR3C.7.4.0_N_OpnSrc
android-7.1.1_r17.5.0_N (PN553)NFC_NCIHALx_ARC0.7.5.0_N_OpnSrc

####Supported Versions on "br_android_ncihalx_o" Branch

Android VersionNXP ReleaseNXP Tag
android-o-preview28.0.9_O (PN553/PN557)NFC_NCIHALx_AR1800.8.0.9_O_OpnSrc
android-o-preview28.0.C_O (PN553/PN557)NFC_NCIHALx_AR1800.8.0.C_O_OpnSrc
android-o-preview28.0.13_O (PN553/PN557)NFC_NCIHALx_AR18C0.8.0.13_O_OpnSrc
android-8.0.0_r48.1.0_O (PN553)NFC_NCIHALx_AR00C0.8.1.0_O_OpnSrc
android-8.0.0_r48.2.0_O (PN557)NFC_NCIHALx_AR18C0.8.2.0_O_OpnSrc
android-8.0.0_r48.2.3_O (PN557)NFC_NCIHALx_AR18C0.8.2.3_O_OpnSrc
android-8.0.0_r48.3.0_O (PN548C2/PN551/PN553)NFC_NCIHALx_AR0054.8.3.0_O_OpnSrc
android-8.0.0_r48.3.0_O (PN548C2/PN551)NFC_NCIHALx_AR003C.8.3.0_O_OpnSrc

Supported versions on "br_android_ncihalx_q" branch

Android VersionNXP ReleaseNXP Tag
aosp-master10.00.04 (SN100x)NFC_AR_00_2000_10.00.04_OpnSrc
aosp-master10.00.06 (SN110x)NFC_AR_00_6000_10.00.06_OpnSrc
aosp-master10.00.08 (SN100x)NFC_AR_00_6000_10.00.08_OpnSrc
aosp-master10.00.0A (SN110)NFC_AR_00_6000_10.00.0A_OpnSrc
aosp-master10.00.0B (SN100)NFC_AR_00_6000_10.00.0B_OpnSrc
aosp-master10.00.0C (SN110)NFC_AR_00_6000_10.00.0C_OpnSrc
android-10.0.0_r210.00.0D (SN110)NFC_AR_00_6000_10.00.0D_OpnSrc
android-10.0.0_r210.00.0F (SN110)NFC_AR_00_6000_10.00.0F_OpnSrc

Supported Version on "br_android_ncihalx_11" branch

Android VersionNXP ReleaseNXP Tag
aosp-master11.01.00 (SN110)NFC_AR_00_6000_11.01.00_OpnSrc
aosp-master11.02.00 (SN110)NFC_AR_00_6000_11.02.00_OpnSrc