diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-14 21:21:38 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-14 21:21:38 +0000 |
commit | e45b2ef6462c471dffafff255b66c72ed31f0767 (patch) | |
tree | c17776dcca232280d286665cfe67834f2d3eddfa | |
parent | fe102714c52ca6a60abe25b7be12d8db0232c1eb (diff) | |
parent | c8ca6bf815ec0339169e0b6f32b74d5b54b5e8b6 (diff) | |
download | device_google_taimen-oreo-mr1-cuttlefish-testing.tar.gz device_google_taimen-oreo-mr1-cuttlefish-testing.tar.bz2 device_google_taimen-oreo-mr1-cuttlefish-testing.zip |
Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testing
Change-Id: Ib45b203a8a502f0acd7a4cda4db21b8f46200f55
-rw-r--r-- | nfc/libnfc-nxp.taimen.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf index 620ba70..23971fe 100644 --- a/nfc/libnfc-nxp.taimen.conf +++ b/nfc/libnfc-nxp.taimen.conf @@ -227,7 +227,7 @@ NXP_SET_CONFIG_ALWAYS=0x00 # UICC2 bit rate A0D1 # SWP1A interface A0D4 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037 -NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, +NXP_CORE_CONF_EXTN={20, 02, 32, 0C, A0, EC, 01, 01, A0, ED, 01, 01, A0, 5E, 01, 01, @@ -238,7 +238,8 @@ NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, A0, D1, 01, 02, A0, D4, 01, 00, A0, DD, 01, 2D, - A0, 37, 01, 35 + A0, 37, 01, 35, + A0, 08, 02, 00, 81 } # A0, F2, 01, 01, # A0, 40, 01, 01, |