summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6921388 from 5077c06bff096b4bda173dcf50bc0c3fac32051e to qt-aml-tzda...android-mainline-10.0.0_r12android10-mainline-tzdata-releaseandroid-build-team Robot2020-10-2145-86/+87
|\
| * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| |\
| | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | |\
| | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | |\
| | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | | |\
| | | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | | | |\
| | | | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-devTreeHugger Robot2020-08-291-1/+2
| | | | | | |\
| | | | | | | * Ensure pending intent on beam notification is immutableGeorge Chang2020-07-301-1/+2
| * | | | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-040-0/+0
| |\| | | | | |
| | * | | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | |\| | | | |
| | | * | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | | |\| | | |
| | | | * | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | | | |\| | |
| | | | | * | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2George Chang2020-08-041-0/+3
| | | | | |\| |
| | | | | | * | Protect Bluetooth device information when using NFC pairingGeorge Chang2020-07-301-0/+3
| | | | | | |/
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-07-0642-80/+80
| * | | | | | Ensure pending intent on NfcBlockedNotification is immutableGeorge Chang2020-05-271-2/+2
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-05-102-3/+3
* | | | | | | Snap for 6439596 from 449c8b636fbee6086025a50741426cad746ecb16 to qt-aml-tzda...android-mainline-10.0.0_r11android-build-team Robot2020-04-2896-74/+394
|\| | | | | |
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-04-231-1/+1
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-04-161-1/+1
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-04-1084-1/+169
| * | | | | | Improve variable naming and coding stylesGeorge Chang2020-04-093-39/+43
| * | | | | | [DO NOT MERGE]Default disable unknown_tag_polling_delayGeorge Chang2020-04-091-1/+1
| * | | | | | Notify user nfc may be blocked after dispatch failedGeorge Chang2020-04-092-0/+37
| * | | | | | Add a notification that tells users their NFC is blockedGeorge Chang2020-04-094-0/+81
| * | | | | | Ignore tag that cannot be dispatchedAlisher Alikhodjaev2020-04-092-1/+14
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-03-162-4/+4
| * | | | | | Merge "Protect Bluetooth device information when using NFC pairing" into qt-q...George Chang2020-02-131-0/+3
| |\ \ \ \ \ \
| | * | | | | | Protect Bluetooth device information when using NFC pairingGeorge Chang2020-02-021-0/+3
| * | | | | | | Merge "Prevent OOB write in phNciNfc_RecvMfResp" into qt-qpr1-devGeorge Chang2020-02-131-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent OOB write in phNciNfc_RecvMfRespGeorge Chang2020-01-311-1/+5
| | |/ / / / / /
| * / / / / / / Set a configurable flag for tag dispatch failed toastGeorge Chang2020-02-072-1/+3
| |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEBill Yi2020-01-131-2/+2
| * | | | | | Merge "Add tag error handling when detecting unknown tech-type" into qt-qpr1-devTreeHugger Robot2019-12-181-37/+47
| |\ \ \ \ \ \
| | * | | | | | Add tag error handling when detecting unknown tech-typeJack Yu2019-11-271-37/+47
| * | | | | | | Import translations. DO NOT MERGEandroid-mainline-10.0.0_r9Bill Yi2019-12-041-1/+1
| |/ / / / / /
* | | | | | | Snap for 6001391 from 5bb5f305ea993fba6683df849dd5c4639b032688 to qt-aml-tzda...android-build-team Robot2019-11-110-0/+0
|\ \ \ \ \ \ \
| * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-11-080-0/+0
| |\| | | | | |
| | * | | | | | Import translations. DO NOT MERGEBill Yi2019-11-081-2/+2
| * | | | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-310-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-3011-32/+32
| | |\ \ \ \ \ \ \
| * | | | | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 18a6c77c5b -s our...Xin Li2019-10-260-0/+0
|/| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge Coral/Flame into AOSP master am: 18a6c77c5b -s oursXin Li2019-10-260-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge Coral/Flame into AOSP masterXin Li2019-10-260-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge Coral/Flame into AOSP masterXin Li2019-10-2511-32/+32
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Skip QD1A.190821.011 in stage-aosp-master am: 055b8cd133Xin Li2019-10-230-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-230-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 5785232 from c9f2f6c0ba3ab5fe2dfaba274a11ea4a3efa9645 to qt-c2f2-rel...android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-08-071-10/+10
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Snap for 5781865 from 011e538f02fa63f60946fe76074517ce2d2b78b3 to qt-c2f2-rel...android-build-team Robot2019-08-061-1/+9
| | | |\ \ \ \ \ \ \ \ \ \