summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge cherrypicks of [11008966, 11008967, 11004166, 11010579, 11010580, 11010...android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android10-d4-s1-releaseandroid10-d4-releaseandroid-build-team Robot2020-04-105-1/+136
|\
| * Improve variable naming and coding stylesGeorge Chang2020-04-103-39/+43
| * [DO NOT MERGE]Default disable unknown_tag_polling_delayGeorge Chang2020-04-101-1/+1
| * Notify user nfc may be blocked after dispatch failedGeorge Chang2020-04-102-0/+37
| * Add a notification that tells users their NFC is blockedGeorge Chang2020-04-104-0/+81
| * Ignore tag that cannot be dispatchedAlisher Alikhodjaev2020-04-102-1/+14
|/
* Snap for 6207072 from 4e1f9625a4e22b3402a7ee5876e86c10c1a97676 to qt-d4-releaseandroid-build-team Robot2020-02-142-1/+8
|\
| * 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
| | |/
* | | Snap for 6197011 from 317956e04c22620c0da334fcbe43c34a22b328f4 to qt-d4-releaseandroid-build-team Robot2020-02-112-1/+3
|\| |
| * | Set a configurable flag for tag dispatch failed toastGeorge Chang2020-02-072-1/+3
| |/
* | Snap for 6132310 from ad6884776d084586fe8236a39fd1e5eeed667c9f to qt-d4-releaseandroid-build-team Robot2020-01-141-2/+2
|\|
| * Import translations. DO NOT MERGEBill Yi2020-01-131-2/+2
* | Snap for 6084772 from c8bed3da8e11603752204bae4f79e616a4d08bfd to qt-d4-releaseandroid-build-team Robot2019-12-191-37/+47
|\|
| * 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
* | | Snap for 6050436 from e5af4846f78902485bfec1db5537a862b5a755ae to qt-d4-releaseandroid-build-team Robot2019-12-051-1/+1
|\| |
| * | Import translations. DO NOT MERGEandroid-mainline-10.0.0_r9Bill Yi2019-12-041-1/+1
| |/
* | Snap for 5998981 from 2a830468f49b6ff38939133e8e1b461f28637792 to qt-d4-releaseandroid-build-team Robot2019-11-101-2/+2
|\|
| * Import translations. DO NOT MERGEBill Yi2019-11-081-2/+2
* | Snap for 5970985 from 90999cc30d7b828ac2978d0d163fa15189ea67e3 to qt-d4-releaseandroid-build-team Robot2019-10-282-11/+11
|\|
| * Fix stack-use-after-scope in NativeNfcManager.cpp am: 3c2a925162Jack Yu2019-10-031-10/+10
| |\
| | * Fix stack-use-after-scope in NativeNfcManager.cppJack Yu2019-10-031-10/+10
| | |\
| | | * Fix stack-use-after-scope in NativeNfcManager.cppJack Yu2019-10-011-10/+10
| * | | Import translations. DO NOT MERGEBill Yi2019-09-141-1/+1
|/ / /
* | | Merge "Improve Toast usage" into qt-r1-devGeorge Chang2019-08-051-10/+10
|\| |
| * | Merge "Improve Toast usage" into qt-r1-devTreeHugger Robot2019-08-061-10/+10
| |\ \
| | * | Improve Toast usageGeorge Chang2019-07-291-10/+10
* | | | [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
|\| | |
| * | | [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
| | |\ \
| | | * \ [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
| | | |\ \
| | | | * \ [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
| | | | |\ \
| | | | | * \ [automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in N...George Chang2019-08-050-0/+0
| | | | | |\ \
| | | | | | * \ [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a1033...Android Build Merger (Role)2019-08-050-0/+0
| | | | | | |\ \
| | | | | | | * \ [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a1033...Android Build Merger (Role)2019-08-051-1/+9
| | | | | | | |\ \
| | | | | | | | * \ [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a1033...Android Build Merger (Role)2019-08-051-1/+9
| | | | | | | | |\ \
| | | | | | | | | * \ [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a1033...Android Build Merger (Role)2019-08-051-1/+9
| | | | | | | | | |\ \
| | | | | | | | | | * \ [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a10332c8Android Build Merger (Role)2019-08-051-1/+9
| | | | | | | | | | |\ \
| | | | | | | | | | | * | [DO NOT MERGE]Prevent length underflow in NfcTag.cppGeorge Chang2019-08-051-1/+9
* | | | | | | | | | | | | [automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e982 am...George Chang2019-08-050-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | [automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e982 am...George Chang2019-08-050-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | [automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e982 am...George Chang2019-08-050-0/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | [automerger skipped] Prevent length underflow in NfcTag.cpp am: 73f392e982 am...George Chang2019-08-050-0/+0
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Prevent length underflow in NfcTag.cpp am: 73f392e982George Chang2019-08-051-1/+9
| | | | |\| | | | | | | |
| | | | | * | | | | | | | Prevent length underflow in NfcTag.cppGeorge Chang2019-08-051-1/+9
| | | | | |\| | | | | | |
| | | | | | * | | | | | | Prevent length underflow in NfcTag.cppGeorge Chang2019-07-311-1/+9
* | | | | | | | | | | | | Prevent length underflow in NfcTag.cpp am: c7b41a9674 am: 5762a2817dGeorge Chang2019-08-051-1/+9
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 22:34:58 +0000