summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7...android-9.0.0_r47pie-qpr3-b-releaseandroid-build-team Robot2019-06-121-0/+15
|\
| * Prevent OOB Read in Mfc_TransceiveGeorge Chang2019-06-121-0/+4
| * Prevent OOB write in Mfc_TransceiveGeorge Chang2019-06-121-0/+5
| * Prevent OOB write in phFriNfc_ExtnsTransceiveGeorge Chang2019-06-121-0/+6
|/
* Snap for 5443865 from 9923dc99e1c1419a99dcee0d252d8a67a321990d to pi-qpr3-b-r...android-9.0.0_r45android-9.0.0_r42android-build-team Robot2019-04-071-4/+4
|\
| * Import translations. DO NOT MERGEBill Yi2019-04-051-4/+4
|/
* Import translations. DO NOT MERGEBill Yi2019-02-151-46/+46
* Import translations. DO NOT MERGEpie-b4s4-devBill Yi2018-12-281-4/+4
* Import translations. DO NOT MERGEBill Yi2018-11-021-1/+1
* Import translations. DO NOT MERGEBill Yi2018-10-282-2/+2
* Import translations. DO NOT MERGEBill Yi2018-09-281-2/+2
* Skip setEnableHostRouting when switching to screen offGeorge Chang2018-08-201-2/+1
* SecureElementService may be unavailable when NfcService is startedYoshiaki Naka2018-07-261-2/+10
* Merge changes from topic "b/78568653" into pi-devpie-dr1-devpie-devRuchi Kandoi2018-06-013-2/+14
|\
| * Adds logic for OFFHOST_AID_ROUTE_PWR_STATERuchi Kandoi2018-05-312-1/+7
| * Fix to issue with routing table update for offhost AID.anil.hiranniah2018-05-291-1/+7
* | Merge "Enable type B card emulation on offhost secure element" into pi-devRuchi Kandoi2018-06-011-0/+2
|\ \
| * | Enable type B card emulation on offhost secure elementJizhou Liao2018-05-291-0/+2
* | | Import translations. DO NOT MERGEBill Yi2018-05-301-1/+1
| |/ |/|
* | Merge "Disable WPS if CHANGE_WIFI_STATE is revoked" into pi-devTreeHugger Robot2018-05-261-1/+12
|\|
| * Disable WPS if CHANGE_WIFI_STATE is revokedDuanmu Lingwei2018-05-241-1/+12
* | Merge "Check if the end activity is exported for Dispatcher." into pi-devTreeHugger Robot2018-05-161-8/+24
|\ \
| * | Check if the end activity is exported for Dispatcher.Ruchi Kandoi2018-05-151-8/+24
| |/
* / Enable debug logs for libnfc_nci_jniGeorge Chang2018-05-141-0/+4
|/
* Merge "Correct BER_TLV Encoding format." into pi-devandroid-build-team Robot2018-05-081-8/+8
|\
| * Correct BER_TLV Encoding format.Ruchi Kandoi2018-04-261-8/+8
* | Import translations. DO NOT MERGEBill Yi2018-04-272-8/+8
|/
* Import translations. DO NOT MERGEBill Yi2018-04-171-1/+1
* Merge changes I958fb22a,I8c147658 into pi-devTreeHugger Robot2018-04-132-10/+11
|\
| * Set Felica Max Transceive payload length to 255 bytesLove Khanna2018-04-131-1/+1
| * Remove bindings even if onConnected() was not calledRuchi Kandoi2018-04-131-9/+10
* | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-132-2/+2
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBill Yi2018-04-132-2/+2
* | Use 0xFEFE as the default System codeRuchi Kandoi2018-04-121-1/+1
* | Add GSMA specific data for TRANSACTION_EVENTRuchi Kandoi2018-04-122-9/+26
|/
* NCI2.0 Support for System Code Based Routing registration and Power State Han...Love Khanna2018-04-103-49/+172
* Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-071-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2018-04-061-1/+1
* | Merge "Do not bind a service, if it has already been disconnected" into pi-devTreeHugger Robot2018-04-061-0/+4
|\ \
| * | Do not bind a service, if it has already been disconnectedRuchi Kandoi2018-04-061-0/+4
* | | Merge "Save the last selected payment service" into pi-devTreeHugger Robot2018-04-061-0/+6
|\| | | |/ |/|
| * Save the last selected payment serviceRuchi Kandoi2018-04-061-0/+6
* | Fix BLE handover failure issueZhaoyu Su2018-04-021-2/+22
|/
* Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-021-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2018-04-022-1/+51
* | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-03-311-0/+50
|\ \
| * | Import translations. DO NOT MERGEBill Yi2018-03-301-0/+50
| |/
* | Initialize debug enabled flag in initializationHiroki Yamamoto2018-03-301-2/+2
* | Support Nfc WifiProtectedSetup with Open auth typeHiroki Yamamoto2018-03-291-4/+14
* | Remove nfca_version related logsHiroki Yamamoto2018-03-291-5/+0
|/