summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* NFCC FW Download related updatesHEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4anil.hiranniah2021-06-291-7/+4
| | | | | | | | | | | | - Remove FW Major & Minor version check from DL get version Info command After FW download - Do NFCC reset after FW Secure Write is success before check Integrity Bug: 179110580 Bug: 173534283 Bug: 168799695 Test: FW download, NFC OFF/ON Change-Id: I5a38a8d96e24e259c930ffdcd433871910791e29
* DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-182-7/+46
|\ | | | | | | | | | | Bug: 190855093 Merged-In: I8f29a3a2f5f218f3cca6be30b55fdd22ceb995ea Change-Id: Ib6f94b5adda72c6bcbed8fd3041df276c8dc45c7
| * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| |\ | | | | | | | | | | | | | | | Bug: 190855093 Merged-In: I65603d8b20919b302cdeebd58a1d8c71b2b45c13 Change-Id: I8f29a3a2f5f218f3cca6be30b55fdd22ceb995ea
| | * Snap for 7215955 from 7cc62bb45c2c77612870f57246be9c3fa27c1253 to ↵android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-03-172-7/+26
| | |\ | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: I1973f489097952675c3f9776da768b0444757c3a
| | * \ Snap for 7198746 from e35de63b6bc7bc4561160d368be81e2312b6f922 to ↵android-build-team Robot2021-03-101-1/+21
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: Iab88230e5253d69e578599650d10c7782dd919f0
| * | \ \ DO NOT MERGE - Merge ab/7272582Xin Li2021-06-172-7/+46
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 190855093 Merged-In: I98fbd6ac69ee89dadadae2f0553be47e3580a838 Change-Id: I65603d8b20919b302cdeebd58a1d8c71b2b45c13
| | * \ \ \ Merge "An integer underflow vuln of nxp nfc hal library" into rvc-qpr-dev ↵temp_ab_7272582Alisher Alikhodjaev2021-03-171-0/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7cc62bb45c Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12902441 Change-Id: I89e50618a80b278d1dd9772373e155e71ca7e2ea
| | | * | | Merge "An integer underflow vuln of nxp nfc hal library" into rvc-qpr-devAlisher Alikhodjaev2021-03-171-0/+4
| | | |\ \ \
| | | | * | | An integer underflow vuln of nxp nfc hal libraryAlisher Alikhodjaev2020-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 169258743 Test: build ok Change-Id: I98fbd6ac69ee89dadadae2f0553be47e3580a838
| | * | | | | Merge "Multiple vulnerabilities in phNxpNciHal_print_res_status" into ↵Alisher Alikhodjaev2021-03-171-7/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr-dev am: 96a5ff6282 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12886988 Change-Id: I536627ee20267b222b152106c7ede1b2cbaa6a5f
| | | * | | | Merge "Multiple vulnerabilities in phNxpNciHal_print_res_status" into ↵Alisher Alikhodjaev2021-03-171-7/+22
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | rvc-qpr-dev
| | | | * | | Multiple vulnerabilities in phNxpNciHal_print_res_statusAlisher Alikhodjaev2020-10-201-7/+22
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 169258884 Bug: 169258733 Bug: 169257710 Test: build ok Change-Id: Icccbe6c781847d5495cc09e9fd72bd5a39011e73
| | * | | | Fix warnings from static analysis tools am: 7f93aba06e am: 5b3b65497banil.hiranniah2021-03-115-17/+16
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1620698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I303d6cc7c5b91ad011774584495990732d1c9de4
| | * \ \ \ \ Merge "An info leak vuln caused by OOB read of nxp nfc hal library" into ↵Alisher Alikhodjaev2021-03-101-1/+21
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr-dev am: e35de63b6b Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12886987 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1faa9c4394d0febe6f0d0d8f0c2068731dcc9c6d
| | | * | | | Merge "An info leak vuln caused by OOB read of nxp nfc hal library" into ↵Alisher Alikhodjaev2021-03-101-1/+21
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | rvc-qpr-dev
| | | | * | | An info leak vuln caused by OOB read of nxp nfc hal libraryAlisher Alikhodjaev2020-12-021-1/+21
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 169258455 Test: build ok Change-Id: I8e296f3ae38ee829d87c0052b5753e2f93bd0dd4
| | * | | | [automerger skipped] Merge RQ2A.210305.007 am: e100dc5643 -s ours am: ↵Xin Li2021-03-030-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63d4fd4041 -s ours am skip reason: Change-Id I748dbfc8f6b79ebf562771f2c631be49e3707a79 with SHA-1 732a9b3c94 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1613647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0c3d3204a063022a444290f7ab4a78afc172ad3e
| | * \ \ \ \ [automerger skipped] Merge ab/7061308 into stage. am: 732a9b3c94 -s oursXin Li2021-02-230-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I85c5d1ffcdcc9cf1466defa72effaf33bf31cfaf with SHA-1 43732a3efc is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/13658390 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f07d04ba1aeb51969e7c83fb92840492eb88979
| | * \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: b1efb68409 am: d44d372320Bob Badour2021-02-193-1/+33
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1588480 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18fa9de959e10fd17a394104a718cd6d3d13d0f9
| | * \ \ \ \ \ \ FW download related enhancements. am: f0d3efe4e5 am: eb281fdd25Jizhou Liao2021-02-012-12/+19
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1566491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc6d515f246e1ee1b4aea6e6d01c74078026243a
| * | \ \ \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: a7d7ed3808Bob Badour2021-05-257-2/+69
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1718391 Change-Id: Ied577f5ec257ad8ca6eea2bff963f64dfab2e672
* | | | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfcBob Badour2021-05-257-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-Apache-2.0 to: Android.bp intf/nxpnfc/1.0/Android.bp intf/nxpnfc/2.0/Android.bp intf/nxpnfc/Android.bp pn8x/Android.bp snxxx/Android.bp snxxx/halimpl/libnxpparser/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5a0c0ac980b44f5c04659df9a544d6cd577d99c7
| * | | | | | | | | Add Nfc hal support for SNXXX am: f05c398607anil.hiranniah2021-05-21201-935/+32997
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1708181 Change-Id: Iaf79efe8023fc363c62c9a200a7eae5f8048c267
* | | | | | | | | | Add Nfc hal support for SNXXXanil.hiranniah2021-05-18201-935/+32997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move existing NFC hal to pn8x/ Add NFC hal for snxxx in snxxx/ Move existing extns/intf to intf/ Update Android.bp files to build hals for pn8x and snxxx BYPASS_INCLUSIVE_LANGUAGE_REASON=keep legacy configuration naming Bug: 188034640 Test: NFC On/Off, CTS, VTS, CE, Tag read Merged-In: Iec29b1eb038f6f524777fdf22a1a48180f0a8b00 Change-Id: Iec29b1eb038f6f524777fdf22a1a48180f0a8b00
| * | | | | | | | | Revert "Add Nfc hal support for SNXXX" am: f21544fea6George Chang2021-05-13201-32983/+923
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1705509 Change-Id: I8de2ca9ae51dcb29c3e39a8f29c529b06c839258
* | | | | | | | | | Revert "Add Nfc hal support for SNXXX"android-s-beta-2android-s-beta-1George Chang2021-05-13201-32983/+923
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5c4c40d081c4d36703fbaa72934f4150e1e47252. Bug: 188009583 Reason for revert: build break Change-Id: I10b8aea6a8688e7dd7eee856a13e875ebdc1a2b5
| * | | | | | | | | Add Nfc hal support for SNXXX am: 5c4c40d081anil.hiranniah2021-05-13201-923/+32983
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1654907 Change-Id: I997519af70f73b80e989bc65c5755360db103354
* | | | | | | | | | Add Nfc hal support for SNXXXanil.hiranniah2021-05-13201-923/+32983
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move existing NFC hal to pn8x/ Add NFC hal for snxxx in snxxx/ Move existing extns/intf to intf/ Update Android.bp files to build hals for pn8x and snxxx BYPASS_INCLUSIVE_LANGUAGE_REASON=keep legacy configuration naming Test: NFC On/Off, CTS, VTS, CE, Tag read Change-Id: Ic1e9f16ef5c4540d49c83dfca06e1cbbbe8ec86c
| * | | | | | | | | [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: ↵Xin Li2021-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 071bea3e7e -s ours am skip reason: Merged-In I013a068cd29631f684b4f6d8986413914b942759 with SHA-1 7f93aba06e is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1699973 Change-Id: Ibcef9c653f0bc7de1ad685e41183a0cb32181ec1
* | | | | | | | | DO NOT MERGE - Mark RQ2A.210105.001 as merged.Xin Li2021-05-070-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I013a068cd29631f684b4f6d8986413914b942759 Change-Id: I61a02351ccfef84f8a5f8d977fe55816b8720a1d
| * \ \ \ \ \ \ \ \ Snap for 7046226 from 4c38779e3c931cc96c56a0d491eb44b866029fb2 to ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot2020-12-231-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | rvc-qpr2-release Change-Id: Ic748564cbe06fc8eabf6c74db97098ce122a9978
| | | * | | | | | Fix warnings from static analysis tools am: 7f93aba06eanil.hiranniah2021-03-115-17/+16
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1620698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c51979a39eb7115b6c813ea841a0913deb42146
* | | | | | | | Fix warnings from static analysis toolsanil.hiranniah2021-03-095-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.INVALID ASSIGNMENT: a. phDnldNfc.cc: phDnldNfc_LoadFW() The size of variables equated are different. "fileSize" is 4 (unsigned int) and "fTellFileSize" is 8(long) b. phDnldNfc_Internal.cc: phDnldNfc_CreateFramePld() Explicit type casting is done to avoid ambiguity. c. phNxpNciHal.cc: phNxpNciHal_core_initialized() The size of variables equated are different. "timeout" is 4 (unsigned int) and "retLen*1000" is 8 (long) d. phNxpNciHal.cc: phNxpNciHal_getVendorConfig() The size of variables equated are different. "config.maxIsoDepTranscieveLength" is 4 (unsigned int) and "num" is 8 (unsigned long) e. phOsalNfc_Timer.cc: phOsalNfc_DeferredCall() "dwIndex" datatype change from uint32_t to unsigned long 2.DO_NOT_USE_INT_IN_FOR_LOOP a. phNxpConfig.cpp: GetNxpNumValue() unsigned int is changed to size_t datatype Bug: 142626701 Test: Nfc-On/Off, Tag read, HCE, VTS Change-Id: I013a068cd29631f684b4f6d8986413914b942759
| | | * | | | | [automerger skipped] Merge RQ2A.210305.007 am: e100dc5643 -s oursXin Li2021-03-030-0/+0
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I748dbfc8f6b79ebf562771f2c631be49e3707a79 with SHA-1 732a9b3c94 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1613647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9dec848c41915eaa781bdea4a7c5dcbff0745a0a
* | | | | | | Merge RQ2A.210305.007Xin Li2021-03-031-0/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I748dbfc8f6b79ebf562771f2c631be49e3707a79 Change-Id: I10f76248bdb5c0cad2223815445d35f8a2e626f7
| * | | | | | Merge ab/7061308 into stage.Xin Li2021-02-211-0/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | Bug: 180401296 Merged-In: I85c5d1ffcdcc9cf1466defa72effaf33bf31cfaf Change-Id: I748dbfc8f6b79ebf562771f2c631be49e3707a79
| | * | | | A stack OOB write vuln of nxp nfc hal library am: 4c38779e3cAlisher Alikhodjaev2020-12-211-0/+5
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12886989 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I85c5d1ffcdcc9cf1466defa72effaf33bf31cfaf
| | | * | | A stack OOB write vuln of nxp nfc hal libraryAlisher Alikhodjaev2020-10-201-0/+5
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 169259605 Test: build ok Change-Id: I5b99093abdee065eed161f3cda41847a35b13e6a
| | * | | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 7f0d264812 -s ↵Xin Li2020-12-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 3d11088509 -s ours am skip reason: Change-Id Ib9aa0c15d2cbdbf5efe36e2155cfe58811541dca with SHA-1 c4862c1b96 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1521190 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie35baae67859b0aa2587559cc02839bf004ce04c
| | * \ \ \ [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li2020-12-030-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4862c1b96 -s ours am skip reason: Change-Id I82d4aff88861d34703b672b9db62cb652ea95550 with SHA-1 1dc19be939 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/13122649 Change-Id: I663811ae675252e3f732da47ad3c022a64b6d034
| | * \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: cc1a12c6a4 -s ours am: ↵Xin Li2020-10-090-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30fd274a0a -s ours am skip reason: Change-Id I364bf3a4f01dee593e18a7f43cd71e6cbdbe266c with SHA-1 fdd7f0431b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12796234 Change-Id: I73aa6d3404d580d8a05a05704b45f55bcbafb0b2
| | | * \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: cc1a12c6a4 -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I364bf3a4f01dee593e18a7f43cd71e6cbdbe266c with SHA-1 fdd7f0431b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12796234 Change-Id: I2006a8ac90209f5c3f4a311acff2f669b8d08419
| * | | \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: b1efb68409Bob Badour2021-02-193-1/+33
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1588480 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifce20bfc730482f0d9552dcd47347ee7c440e736
* | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfcBob Badour2021-02-123-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-Apache-2.0 to: Android.bp extns/intf/nxpnfc/1.0/Android.bp extns/intf/nxpnfc/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia8ab737b4b67eb4a038e18fe9f792b119a517990
| * | | | | | | FW download related enhancements. am: f0d3efe4e5Jizhou Liao2021-02-012-12/+19
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1566491 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I14bfa8646537f123a95b4d9fa0cad77da59c78cc
* | | | | | | FW download related enhancements.android-s-preview-1Jizhou Liao2021-01-292-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Support FW update if major version in file is greater than current major version on the device 2) Retry logic for Force FW Update in MinOpen corrected. Test: Nfc-on/Off, FW Download regular/Tearing scenarios, CE tests Change-Id: I1239ab64894418accb7502a38cc57f58eeeb0cb3
| * | | | | | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 7f0d264812 -s oursXin Li2020-12-100-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Ib9aa0c15d2cbdbf5efe36e2155cfe58811541dca with SHA-1 c4862c1b96 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1521190 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I16a484e788d62556530fbd36faca6c942560bff4
* | | | | | DO NOT MERGE - Merge Android R QPR1Xin Li2020-12-084-12/+23
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Bug: 172690556 Merged-In: Ib9aa0c15d2cbdbf5efe36e2155cfe58811541dca Change-Id: I73f994866ebaba3e4e7f9345a998efb6a7a587c3
| * | | | Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-234-12/+23
|/| | | | | |/ / / | | | | | | | | | | | | | | | | Bug: 172690556 Merged-In: I82d4aff88861d34703b672b9db62cb652ea95550 Change-Id: Ib9aa0c15d2cbdbf5efe36e2155cfe58811541dca
| * | | [automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b ↵Xin Li2020-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: cd9bc9bb59 -s ours am: d829436900 -s ours am skip reason: Change-Id I6c989df8c8bcfbac6c5d1c14d2876de20192759b with SHA-1 a9f74e4c8f is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1421780 Change-Id: I82d4aff88861d34703b672b9db62cb652ea95550
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 06:42:02 +0000