summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0...HEADlineage-17.1Kevin F. Haggerty2020-06-013-3/+20
|\
| * Snap for 6337011 from b2e9acf4eb6b04402c6ced50fcd9806566c7f7d1 to qt-qpr3-rel...android-build-team Robot2020-03-262-2/+12
| |\
| | * Merge "Prevent OOB write in phNxpNciHal_write_ext" into qt-qpr1-devGeorge Chang2020-03-261-2/+4
| | |\
| | | * Prevent OOB write in phNxpNciHal_write_extGeorge Chang2020-03-261-2/+4
| | * | Merge "Prevent OOB write in phNxpNciHal_send_ese_hal_cmd" into qt-qpr1-devGeorge Chang2020-03-261-0/+4
| | |\ \ | | | |/ | | |/|
| | | * Prevent OOB write in phNxpNciHal_send_ese_hal_cmdGeorge Chang2020-02-211-0/+4
| | * | Merge "Prevent OOBR in NxpNfc::ioctl" into qt-qpr1-devTreeHugger Robot2020-03-251-0/+4
| | |\ \
| | | * | Prevent OOBR in NxpNfc::ioctlJack Yu2020-03-201-0/+4
| | | |/
| * | / Snap for 6332289 from 9e2d8a17571c6a62cc6db669e51147582632bb0b to qt-qpr3-rel...android-build-team Robot2020-03-251-1/+8
| |\| | | | |/ | |/|
| | * Prevent potential OOB in phNxpNciHal_NfcDep_cmd_extGeorge Chang2020-02-211-1/+8
| |/
* | Ignore implicit fall-through warningsstaging/lineage-17.0_merge-android-10.0.0_r9Michael Bestas2019-12-111-1/+1
* | nfc: Restore pn548 support to 1.1 HALRashed Abdel-Tawab2019-12-1110-4/+163
|/
* Merge "NfCC power state tracker implementation" into qt-devTreeHugger Robot2019-04-196-12/+657
|\
| * NfCC power state tracker implementationanil.hiranniah2019-04-156-12/+657
* | Support NFC HAL V1.2anil.hiranniah2019-04-158-13/+399
|/
* Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\
| * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-022-4/+3
| |\ | |/ |/|
* | Do not set property persist.factoryota.reboot am: 58a4ea0fe0 am: 6ccff875a5Jack Yu2019-03-291-3/+0
|\ \
| * \ Do not set property persist.factoryota.reboot am: 58a4ea0fe0Jack Yu2019-03-291-3/+0
| |\ \
| | * \ Do not set property persist.factoryota.rebootJack Yu2019-03-291-3/+0
| | |\ \
| | | * | Do not set property persist.factoryota.rebootJack Yu2019-03-281-3/+0
* | | | | Update OWNERS file am: 3119f327af am: 81233ff30cJack Yu2019-03-271-1/+3
|\| | | | | |_|_|/ |/| | |
| * | | Update OWNERS file am: 3119f327afJack Yu2019-03-271-1/+3
| |\| |
| | * | Update OWNERS fileJack Yu2019-03-271-1/+3
| | |\|
| | | * Update OWNERS fileJack Yu2019-03-261-1/+3
* | | | Rename persist.nfc.uicc_enabled to persist.vendor.nfc.uicc_enabled am: 28006a...Ruchi Kandoi2019-03-181-1/+1
|\| | |
| * | | Rename persist.nfc.uicc_enabled to persist.vendor.nfc.uicc_enabled am: 28006a...Ruchi Kandoi2019-03-181-1/+1
| |\| |
| | * | Rename persist.nfc.uicc_enabled to persist.vendor.nfc.uicc_enabledRuchi Kandoi2019-03-181-1/+1
| | |\|
| | | * Rename persist.nfc.uicc_enabled to persist.vendor.nfc.uicc_enabledRuchi Kandoi2019-03-181-1/+1
* | | | Clean up NFC HAL error logs am: 7f837acc59 am: 8cb664337cpdk2019-03-188-70/+58
|\| | |
| * | | Clean up NFC HAL error logs am: 7f837acc59pdk2019-03-188-70/+58
| |\| |
| | * | Clean up NFC HAL error logspdk2019-03-188-70/+58
| | |\|
| | | * Clean up NFC HAL error logspdk2019-03-158-70/+58
* | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: bc1...The Android Open Source Project2019-03-120-0/+0
|\| | |
| * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: bc1...The Android Open Source Project2019-03-120-0/+0
| |\| |
| | * | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterThe Android Open Source Project2019-03-120-0/+0
| | |\|
| | | * DO NOT MERGE - Merge PPRL.190305.001 into masterThe Android Open Source Project2019-03-111-2/+11
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-mas...The Android Open Source Project2019-03-110-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-masterThe Android Open Source Project2019-03-110-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-masterThe Android Open Source Project2019-03-080-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Snap for 5240760 from d6afaec61a6a4114d0f89f72d2b7404376061595 to pi-platform...android-build-team Robot2019-03-081-2/+11
| | | |\ \
| | | | * \ Merge cherrypicks of [6072697, 6072075, 6072758, 6072124, 6072885, 6072886, 6...android-build-team Robot2019-01-161-2/+11
| | | | |\ \
| | | | | * | Prevent Out of bound error in phNxpNciHal_process_ext_rspGeorge Chang2019-01-161-2/+11
| | | | |/ /
* | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | |
| * | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | |
| | * | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-211-2/+11
| | |\ \ \ \
* | | | | | | [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001...Xin Li2019-02-140-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001...Xin Li2019-02-140-0/+0
| |\| | | | |
| | * | | | | DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-masterXin Li2019-02-120-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Snap for 5180536 from 1a7ca2f8c750c84c17bf3fd6e97810b7cee176ba to pi-platform...android-build-team Robot2019-02-091-0/+56
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 05:57:47 +0000