aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedHEADmasterXin Li2020-08-270-0/+0
|\
| * Extend timeout value of RW power notification monitor am: b33f02fc78 am: cd9b...Jack Yu2020-06-231-1/+1
| |\
| * \ [automerger skipped] Merge QQ3A.200605.002 into master am: a680d24231 -s ours...Xin Li2020-06-080-0/+0
| |\ \
| * \ \ Add METADATA to nfc: Apache2=NOTICE am: b8aa0f432a am: c32e04c974Bob Badour2020-05-041-0/+3
| |\ \ \
| * \ \ \ [automerger skipped] Correct NCI command size am: 53fedaa833 -s oursArach MOHAMMED BRAHIM2020-04-210-0/+0
| |\ \ \ \
| | * | | | Correct NCI command sizeandroid11-devArach MOHAMMED BRAHIM2020-04-211-1/+6
| * | | | | Correct NCI command size am: 42be7028db am: 2bd4f41b3dArach MOHAMMED BRAHIM2020-04-161-1/+6
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Add NFC configuration file search rules am: 34c23dd4bd -...Arach MOHAMMED BRAHIM2020-04-150-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Add NFC configuration file search rulesArach MOHAMMED BRAHIM2020-04-091-6/+21
| * | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Add NFC configuration file search rules am: fe2b3c2d23 am: d4c0ce081fArach MOHAMMED BRAHIM2020-04-091-6/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ [automerger skipped] Fix stack-buffer-overflow in hal_fd_init() am: 1c9965180...Jack Yu2020-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | [automerger skipped] Fix stack-buffer-overflow in hal_fd_init() am: 1c9965180...Jack Yu2020-03-200-0/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | [automerger skipped] Don't close HAL before last callback has been fully post...Automerger Merge Worker2020-03-170-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Don't close HAL before last callback has been fully posted.Arach MOHAMMED BRAHIM2020-03-161-3/+2
| * | | | | | | | | | Don't close HAL before last callback has been fully posted. am: e66bed746f am...Automerger Merge Worker2020-03-161-3/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | [automerger skipped] Fix stack-buffer-overflow in hal_fd_init() am: e427b344d...Automerger Merge Worker2020-02-190-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix stack-buffer-overflow in hal_fd_init()Jack Yu2020-02-132-3/+7
| * | | | | | | | | | | Clear pointers when deallocation in hal_fd_close() am: b9a0c59490 am: 90d1cea...Automerger Merge Worker2020-02-061-3/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Correct behavior after FW update." am: 592b0c042a am: 75437f9260Arach MOHAMMED BRAHIM2019-11-272-26/+53
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge AOSP master into stage-aosp-master. am: bbc39cef63 am: be2afc022fXin Li2019-10-252-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-mas...Xin Li2019-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Remove libhwbinder/libhidltransport deps am: 0898424d2e am: 0bfe1e9a6cSteven Moreland2019-10-073-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Remove force FW update at factory reset" into qt-...Jun Yin2019-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove force FW update at factory reset" into qt-r1-dev am: 6955738c9e...Jun Yin2019-09-202-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "[automerger skipped] Monitor the RW power notification. am: a9ebe5e705...Arach MOHAMMED BRAHIM2019-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Monitor the RW power notification. am: a9ebe5e705 -s our...Arach MOHAMMED BRAHIM2019-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Monitor the RW power notification. am: 441cdee29cArach MOHAMMED BRAHIM2019-09-196-2/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add ST eSE/eSIM Reset process am: 044d2c2661 am: 4a31e706adGeorge Chang2019-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add ST eSE/eSIM Reset process am: 044d2c2661 am: 850a09458cGeorge Chang2019-08-261-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Perform a FW update at factory reset am: cf7bd92e6e am: ...Arach MOHAMMED BRAHIM2019-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Perform a FW update at factory reset am: 361eaeef77 am: 2c08c6e71dArach MOHAMMED BRAHIM2019-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Perform a FW update at factory reset am: 361eaeef77Arach MOHAMMED BRAHIM2019-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Perform a FW update at factory reset am: cf7bd92e6e am: ...Arach MOHAMMED BRAHIM2019-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Perform a FW update at factory reset am: 361eaeef77Arach MOHAMMED BRAHIM2019-05-143-4/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add device dependent settings to be updated during NFC enable am: e1544a3c42Arach MOHAMMED BRAHIM2019-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Add a USB charging mode configuration am: 39628fef63 -s ...Arach MOHAMMED BRAHIM2019-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add device dependent settings to be updated during NFC enable am: dbc5db04a7 ...Arach MOHAMMED BRAHIM2019-05-078-86/+228
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add a USB charging mode configuration am: 8b5178e20c am: decaf2ee48Arach MOHAMMED BRAHIM2019-05-073-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5428150 into git_qt-dev. am: 23e787d489Bill Rassieur2019-04-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-023-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Delay before sending RF_DEACTIVATE_CMD if the previous read command is...George Chang2020-08-101-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Delay before sending RF_DEACTIVATE_CMD if the previous read command is...George Chang2020-08-101-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay before sending RF_DEACTIVATE_CMD if the previous read command is pendingGeorge Chang2020-08-061-0/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow timeouts when sending the MODE OFF command am: d51c023419Arach MOHAMMED BRAHIM2020-08-062-2/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow timeouts when sending the MODE OFF commandArach MOHAMMED BRAHIM2020-08-062-2/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid system lock when CLF has always data to send am: 4cf3e46240Arach MOHAMMED BRAHIM2020-08-062-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |