Request new Bluetooth runtime permissions.

An upcoming platform change is introducing a new "Nearby devices"
runtime permission which contains the new BLUETOOTH_CONNECT and
BLUETOOTH_SCAN permissions.

We have logic in place to use <split-permission> to translate the
older BLUETOOTH and BLUETOOTH_ADMIN permissions into these new
runtime permissions, but modern apps will need to pivot to
requesting them directly as part of targeting Android S.

This change requests both the old and new permissions to avoid
breakage while the new permission enforcement is being phased in.

Bug: 181813006
Test: atest CtsPermission2TestCases
Test: atest CtsPermission3TestCases
Test: atest CtsStatsdAtomHostTestCases
(cherry picked from commit eaf56c8522bf0132b48627906e42b61f1bd6bcac)

Change-Id: I9bceb46919b673995e10d1e0ac9a53907618e2ad
1 file changed
tree: f8993bb3fdc175620ab9062dbc2ac1d0bf56e64b
  1. assets/
  2. nci/
  3. nfc-dta/
  4. res/
  5. src/
  6. tests/
  7. .clang-format
  8. .gitignore
  9. Android.bp
  10. AndroidManifest.xml
  11. CleanSpec.mk
  12. nfc_system_product.mk
  13. OWNERS
  14. PREUPLOAD.cfg
  15. README.md
README.md

NFC_NCIHAL_Nfc

Git Repository

DESCRIPTIONCHECKOUT COMMAND
NFC_NCIHAL_Nfcgit clone https://github.com/NXPNFCProject/NFC_NCIHAL_Nfc.git

Supported Version on "br_android_ncihalx_row_12" branch

Android VersionNXP ReleaseNXP Tag
aosp-master12.01.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_12.01.00_OpnSrc

Supported Version on "br_android_ncihalx_row_11" branch

Android VersionNXP ReleaseNXP Tag
aosp-master11.01.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_11.01.00_OpnSrc
aosp-master11.01.01 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_11.01.01_OpnSrc
android-11.0.0_r311.02.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_11.02.00_OpnSrc
android-11.0.0_r311.03.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_11.03.00_OpnSrc

Supported Version on "br_android_ncihalx_row_q" branch

Android VersionNXP ReleaseNXP Tag
aosp-master10.01.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_10.01.00_OpnSrc
aosp-master10.02.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_10.02.00_OpnSrc
android-10.0.0_r210.03.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_10.03.00_OpnSrc
android-10.0.0_r210.04.00 (PN80T/PN81T/PN553/PN557)NFC_AR_00_18C0_10.04.00_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
aosp-master11.02.01 (SN110)NFC_AR_00_6000_11.02.01_OpnSrc

Supported Version on "br_android_ncihalx_comm_12" branch

Android VersionNXP ReleaseNXP Tag
aosp-master12.51.00 (SN110)NFC_AR_00_02.00_6000_12.51.00_OpnSrc
aosp-master12.02.01 (SN100/SN110/SN220)NFC_AR_00_E000_12.02.01_OpnSrc
aosp-master12.04.01 (SN100/SN110/SN220)NFC_AR_00_E000_12.04.01_OpnSrc

NXPAndroidDTA

Git Repository

DESCRIPTIONCHECKOUT COMMAND
NXPAndroidDTAgit clone https://github.com/NXPNFCProject/NXPAndroidDTA.git

Supported Android Versions

Android VersionNXP ReleaseNXP TagDTA Version
android-8.0.0_r4/android-8.1.0_r711.01 (PN548C2/PN551/PN553/PN557)NFC_NCIHALx_AR00C0.8.4.0_OpnSrcDTA 11.01
android-p-preview 211.06 (PN553/PN557)NFC_NCIHALx_AR00C0.9.0.D_OpnSrcDTA 11.06
android-9.0.0_r311.07 (PN557)NFC_NCIHALx_AR0800.9.1.0_OpnSrcDTA 11.07
android-9.0.0_r311.08 (PN81T/PN557)NFC_NCIHALx_AR1800.9.2.0_OpnSrcDTA 11.08
android-p-preview 211.09 (SN100x/PN553)NFC_NCIHALx_AR2000.09.00.0C_OpnSrc NFC_NCIHALx_AR2000.09.00.0F_OpnSrcDTA 11.09
android-p-preview 211.0A (SN100x)NFC_NCIHALx_AR2000.09.00.11_OpnSrcDTA 11.0A
android-p-preview 211.0B (SN100x/PN8xT)NFC_NCIHALx_AR2000.09.00.13_OpnSrc NFC_NCIHALx_AR0040.9.3.0_OpnSrc NFC_NCIHALx_AR00C0.9.4.0_OpnSrc NFC_NCIHALx_AR1800.9.5.0_OpnSrc NFC_NCIHALx_AR2000.09.00.15_OpnSrc NFC_NCIHALx_AR2000.09.00.16_OpnSrc NFC_NCIHALx_AR2000.09.00.17_OpnSrc NFC_NCIHALx_AR2000.09.00.18_OpnSrcDTA 11.0B
android-p-preview 211.0C (PN8xT)NFC_NCIHALx_AR18C0.9.6.0_OpnSrcDTA 11.0C
android-p-preview 211.0D (SN100x)NFC_NCIHALx_AR2000.09.00.19_OpnSrcDTA 11.0D
aosp-master11.0D (SN100x)NFC_AR_00_2000_10.00.04_OpnSrcDTA 11.0D
aosp-master11.0D (SN100x/PN553/PN557/PN80T/PN81T)NFC_AR_00_6000_10.00.06_OpnSrc NFC_AR_00_18C0_10.01.00_OpnSrcDTA 11.0D
aosp-master11.0F (PN553/PN557/PN80T/PN81T)NFC_AR_00_18C0_10.02.00_OpnSrcDTA 11.0F
aosp-master11.10 (SN110x/SN100)NFC_AR_00_6000_10.00.0A_OpnSrc NFC_AR_00_6000_10.00.0B_OpnSrcDTA 11.10
android-10.0.0_r211.11 (PN553/PN557/PN80T/PN81T)NFC_AR_00_18C0_10.03.00_OpnSrcDTA 11.11
android-p-preview 211.13 (SN100x)NFC_NCIHALx_AR2000.09.00.1B_OpnSrcDTA 11.13
android-10.0.0_r211.13 (PN553/PN557/PN80T/PN81T)NFC_AR_00_18C0_10.04.00_OpnSrcDTA 11.13
android-10.0.0_r211.14 (SN1xx)NFC_AR_00_6000_10.00.14_OpnSrc NFC_AR_00_6000_10.00.15_OpnSrcDTA 11.14
aosp-master11.15 (SN1xx/PN553/PN557/PN80T/PN81T)NFC_AR_00_6000_11.02.00_OpnSrc NFC_AR_00_18C0_11.01.01_OpnSrcDTA 11.15
android-10.0.0_r211.17 (SN1xx)NFC_AR_00_6000_10.00.17_OpnSrcDTA 11.17
android-11.0.0_r311.19 (SN1xx/PN553/PN557/PN80T/PN81T)NFC_AR_00_18C0_11.02.00_OpnSrc NFC_AR_00_18C0_11.03.00_OpnSrc NFC_AR_00_6000_11.51.01_OpnSrc NFC_AR_00_6000_11.57.00_OpnSrcDTA 11.19
aosp-master12.11 (SN100/SN110/SN220)NFC_AR_00_E000_12.02.01_OpnSrcDTA 12.11