summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * \ \ Fix warnings from static analysis tools am: 7f93aba06eanil.hiranniah2021-03-115-17/+16
| |\ \ \
| | * | | Fix warnings from static analysis toolsanil.hiranniah2021-03-095-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 RQ2A.210305.007 am: e100dc5643 -s oursXin Li2021-03-030-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge RQ2A.210305.007Xin Li2021-03-031-0/+5
| | |\ \ \ | | |/ / / | |/| | |
* | | | | [automerger skipped] Merge ab/7061308 into stage. am: 732a9b3c94 -s oursXin Li2021-02-230-0/+0
|\| | | |
| * | | | Merge ab/7061308 into stage.Xin Li2021-02-211-0/+5
| |\ \ \ \
* | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/nxp/nfc am: b1efb68409 am: d44d372320Bob Badour2021-02-193-1/+33
|\| | | | |
| * | | | | [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: f0d3efe4e5 am: eb281fdd25Jizhou Liao2021-02-012-12/+19
|\| | | | | | |_|/ / / |/| | | |
| * | | | FW download related enhancements. am: f0d3efe4e5Jizhou Liao2021-02-012-12/+19
| |\| | |
| | * | | FW download related enhancements.android-s-preview-1Jizhou Liao2021-01-292-12/+19
* | | | | 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] 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
| | |\ \ | | |/ / | |/| |
* | | | [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: c...Xin Li2020-12-030-0/+0
|\| | |
| * | | Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-234-12/+23
| |\ \ \ | | |/ / | |/| |
* | | | [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
| |\| |
| | * | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
| | |\ \
* | | | | [automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s...Xin Li2020-09-110-0/+0
|\| | | |
| * | | | [automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s...Xin Li2020-09-110-0/+0
| |\ \ \ \
| | * | | | [automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s...Xin Li2020-09-110-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge Android R am: efa54560d6 -s oursXin Li2020-09-110-0/+0
| | | |\ \ \
| | | | * \ \ Merge Android RXin Li2020-09-082-5/+6
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |\| | |
| | | * | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-272-5/+6
| | | |\ \ \ | | | |/ / / | | |/| / / | | | |/ /
* | | | | Prevent OOB read in phNxpNciHal_core_initialized am: b3a413395fJack Yu2020-07-154-12/+23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Prevent OOB read in phNxpNciHal_core_initializedandroid-11.0.0_r30android11-qpr1-c-releaseJack Yu2020-06-184-12/+23
* | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s ours...Xin Li2020-06-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s ours...Xin Li2020-06-080-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | [automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s oursXin Li2020-06-080-0/+0
| | | |\ \
| | | | * \ Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-033-3/+20
| | | | |\ \ | | | | |/ / | | | |/| |
* | | | | | Add METADATA to nfc: Apache2=NOTICE am: a98ea6e6cf am: ad4ea2a098 am: ba6dde9...Bob Badour2020-05-041-0/+3
|\| | | | |