summaryrefslogtreecommitdiffstats
Commit message (Expand)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
* DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-182-7/+46
|\
| * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| |\
| | * Snap for 7215955 from 7cc62bb45c2c77612870f57246be9c3fa27c1253 to rvc-qpr3-re...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
| | |\
| | * \ Snap for 7198746 from e35de63b6bc7bc4561160d368be81e2312b6f922 to rvc-qpr3-re...android-build-team Robot2021-03-101-1/+21
| | |\ \
| * | \ \ DO NOT MERGE - Merge ab/7272582Xin Li2021-06-172-7/+46
| |\ \ \ \
| | * \ \ \ Merge "An integer underflow vuln of nxp nfc hal library" into rvc-qpr-dev am:...temp_ab_7272582Alisher Alikhodjaev2021-03-171-0/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | 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
| | * | | | | Merge "Multiple vulnerabilities in phNxpNciHal_print_res_status" into rvc-qpr...Alisher Alikhodjaev2021-03-171-7/+22
| | |\| | | |
| | | * | | | Merge "Multiple vulnerabilities in phNxpNciHal_print_res_status" into rvc-qpr...Alisher Alikhodjaev2021-03-171-7/+22
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Multiple vulnerabilities in phNxpNciHal_print_res_statusAlisher Alikhodjaev2020-10-201-7/+22
| | | | |/ /
| | * | | | Fix warnings from static analysis tools am: 7f93aba06e am: 5b3b65497banil.hiranniah2021-03-115-17/+16
| | |\ \ \ \
| | * \ \ \ \ Merge "An info leak vuln caused by OOB read of nxp nfc hal library" into rvc-...Alisher Alikhodjaev2021-03-101-1/+21
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "An info leak vuln caused by OOB read of nxp nfc hal library" into rvc-...Alisher Alikhodjaev2021-03-101-1/+21
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | An info leak vuln caused by OOB read of nxp nfc hal libraryAlisher Alikhodjaev2020-12-021-1/+21
| | | | | |/ | | | | |/|
| | * | | | [automerger skipped] Merge RQ2A.210305.007 am: e100dc5643 -s ours am: 63d4fd4...Xin Li2021-03-030-0/+0
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] Merge ab/7061308 into stage. am: 732a9b3c94 -s oursXin Li2021-02-230-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: b1efb68409 am: d44d372320Bob Badour2021-02-193-1/+33
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ FW download related enhancements. am: f0d3efe4e5 am: eb281fdd25Jizhou Liao2021-02-012-12/+19
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: a7d7ed3808Bob Badour2021-05-257-2/+69
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfcBob Badour2021-05-257-2/+69
| * | | | | | | | | Add Nfc hal support for SNXXX am: f05c398607anil.hiranniah2021-05-21201-935/+32997
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Add Nfc hal support for SNXXXanil.hiranniah2021-05-18201-935/+32997
| * | | | | | | | | Revert "Add Nfc hal support for SNXXX" am: f21544fea6George Chang2021-05-13201-32983/+923
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Revert "Add Nfc hal support for SNXXX"android-s-beta-2android-s-beta-1George Chang2021-05-13201-32983/+923
| * | | | | | | | | Add Nfc hal support for SNXXX am: 5c4c40d081anil.hiranniah2021-05-13201-923/+32983
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Add Nfc hal support for SNXXXanil.hiranniah2021-05-13201-923/+32983
| * | | | | | | | | [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 071b...Xin Li2021-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | DO NOT MERGE - Mark RQ2A.210105.001 as merged.Xin Li2021-05-070-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Snap for 7046226 from 4c38779e3c931cc96c56a0d491eb44b866029fb2 to rvc-qpr2-re...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
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | * | | | | | Fix warnings from static analysis tools am: 7f93aba06eanil.hiranniah2021-03-115-17/+16
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | / | | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Fix warnings from static analysis toolsanil.hiranniah2021-03-095-17/+16
| | | * | | | | [automerger skipped] Merge RQ2A.210305.007 am: e100dc5643 -s oursXin Li2021-03-030-0/+0
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | | | |_|_|/ | | | |/| | |
* | | | | | | Merge RQ2A.210305.007Xin Li2021-03-031-0/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge ab/7061308 into stage.Xin Li2021-02-211-0/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | A stack OOB write vuln of nxp nfc hal library am: 4c38779e3cAlisher Alikhodjaev2020-12-211-0/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | A stack OOB write vuln of nxp nfc hal libraryAlisher Alikhodjaev2020-10-201-0/+5
| | | |/ /
| | * | | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 7f0d264812 -s ou...Xin Li2020-12-100-0/+0
| | |\ \ \
| | * \ \ \ [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: c...Xin Li2020-12-030-0/+0
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: cc1a12c6a4 -s ours am: 30f...Xin Li2020-10-090-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: cc1a12c6a4 -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \
| * | | \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: b1efb68409Bob Badour2021-02-193-1/+33
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfcBob Badour2021-02-123-1/+33
| * | | | | | | FW download related enhancements. am: f0d3efe4e5Jizhou Liao2021-02-012-12/+19
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
* | | | | | | FW download related enhancements.android-s-preview-1Jizhou Liao2021-01-292-12/+19
| * | | | | | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 7f0d264812 -s oursXin Li2020-12-100-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
* | | | | | DO NOT MERGE - Merge Android R QPR1Xin Li2020-12-084-12/+23
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-234-12/+23
|/| | | | | |/ / /
| * | | [automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s...Xin Li2020-09-110-0/+0
| |\| |