summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+764
| | | | | Change-Id: I4ea922751dc2c0ebdba0c620497301d00bc3cd0c Ticket: -
* Nfc: read extra properties of Mifare ClassicHamster Tian2016-12-301-0/+11
| | | | | | | * Fixes NFC TagInfo crash with MFC and native NFC stack. Change-Id: Ib5042f6969d34070fbf0b54b26596b86eda1cd26 (cherry picked from commit 018ec89d460f8b6389b4ffe787d293090dcc0bdd)
* Revert "Stop building NXP stack."Bruno Martins2016-12-303-6/+25
| | | | | | This reverts commit 988c3fff5470a1de3a880bd07fa438cc47e283c8. Change-Id: I787ea2b8a2c6977cefb1ad72952b8a1ed7a52660
* Merge b516b5681783ea38a834d77fc02926737472076f on remote branchLinux Build Service Account2016-12-1512-62/+119
|\ | | | | | | Change-Id: I617e90263c9c0689633be6ca72269852a3a59961
| * Merge N-MR1 to remoteLalit Kansara2016-12-0612-62/+119
|/| | | | | | | Change-Id: Ia18218e4f9e2e4be1faab9da16866b168a77bda6
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-170-0/+0
| | | |\
| | | | * Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By also verifying the NDEF message has changed. Bug: 30201458 Change-Id: I7349d3d26c63b993ec07ce0c5c55a61a3a396f6e
| * | | | Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-313-14/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6e95c4d9da Change-Id: If0bfe08a80df11631fc46053d7ca8e88173ded92
| | * | | | Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-313-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we get a timeout status from the stack, store that state so we don't dispatch tags with empty NDEF messages with a read timeout. This was already done when we timed out while reading NDEF meta-data, but not the message itself. Also, don't play sounds during detection at all; NDEF messages are usually so small that the "start detect" sound is immediately followed by either a "success" sound or a "failure" sound; we now only play a sound if the tag was successfully read and will be dispatched. Bug: 31165960 Change-Id: I4738731ad3b265df08a22666e52d801578dd329f
| * | | | | Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-230-0/+0
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: b0cc05288d Change-Id: I9270f29c29b0a28dbf245a94d836f951715e757a
| | * | | Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-221-8/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some early implementations of OOB, TK was send in bad, reversed order, and was implemented in such way. This patch fixes that. Bug: 30675596 Change-Id: Id6af6d96cd35ef118372319bab39862ba0501f29
| * / / Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-191-8/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | In some early implementations of OOB, TK was send in bad, reversed order, and was implemented in such way. This patch fixes that. Bug: 30675596 Change-Id: Id6af6d96cd35ef118372319bab39862ba0501f29
| * | Fix Tron stats reporting.Martijn Coenen2016-08-121-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix counter names, as "tron_varz" is automatically appended. Also, only try to upload stats every four hours. Bug: 30424959 Change-Id: I1b168467888e1d5d6e7bc478ccc833c498292108
| * | Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| |/ | | | | | | | | | | | | By also verifying the NDEF message has changed. Bug: 30201458 Change-Id: I7349d3d26c63b993ec07ce0c5c55a61a3a396f6e
| * Add unregisterReceiver to fix a potential leakWei Wang2016-08-101-0/+9
| | | | | | | | | | | | Bug: 30779663 Change-Id: Id9ca8c2e48c83961865f5abc14ac3fbbeab1306f
| * Tron Metrics for Tag/P2P/HCE.Martijn Coenen2016-08-051-0/+29
| | | | | | | | | | Bug: 30424959 Change-Id: I00c4e5d7429ba3e741d96d66c40a4bfb346e17b2
| * Import translations. DO NOT MERGEBill Yi2016-07-204-7/+7
| | | | | | | | | | Change-Id: I53fdbc6e69fa85d29178eaa26d1a259869dab0be Auto-generated-cl: translation import
| * Merge "Fix HCE can't handle last empty I-block of a chain" into nyc-mr1-devMartijn Coenen2016-06-301-8/+8
| |\
| | * Fix HCE can't handle last empty I-block of a chainJizhou Liao2016-06-241-8/+8
| | | | | | | | | | | | | | | | | | | | | If the I‐block received has a zero length and it is the last packet of a chain, it should not be ignored. Change-Id: Ibab295516e3dd44d8b4fa1f80a0a8e4bcbe4f435
| * | Fix Nfc beam status that is stuck in wrong stategeorge.kg_chang2016-06-271-1/+2
| | | | | | | | | | | | | | | | | | | | | Bug: 29343365 Change-Id: I561bd02fa770b21320702491f882c09c85b08ebb Signed-off-by: george.kg_chang <george.kg_chang@htc.com>
| * | Merge "nfc: Clock up temporarily when doing NFC payment transaction" into ↵TreeHugger Robot2016-06-222-0/+13
| |\ \ | | | | | | | | | | | | nyc-mr1-dev
| | * | nfc: Clock up temporarily when doing NFC payment transactionles_lee2016-06-202-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | Provide user interaction hint during NFC payment transaction to meet timing requirements. Bug: 29039566 Change-Id: Ia57e2e1af547049258c11f3b427f72a97528c0e5
| * | Allow system_server access to NFC reader mode API. am: 8561f64804 am: ↵Martijn Coenen2016-06-220-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c6a969835 am: 87f7a52ec5 am: 0e2618f536 am: 35e9103b07 Change-Id: Idb186a774b5f2dc7fab518dc79d7a24a4ae240a9
| * \ \ Merge \"Allow system_server access to NFC reader mode API.\" into nyc-devMartijn Coenen2016-06-221-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 85c4e15264 Change-Id: Idb2ea1dbb2ad3d4f32f3ed01e138e8d43330da6b
| * \ \ \ Allow peripheral/WiFi handover in provision mode.Martijn Coenen2016-06-211-10/+10
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: 06486f5853 Change-Id: Ia7e2f3d5e226b491313897652944456e1fa2fa63
| * | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-0510-24/+24
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBill Yi2016-06-0310-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia28f68a84a72bc7b539330b363f9105ab1dceaa0 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEBill Yi2016-06-040-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5d1ffeb3f3 -s ours * commit '5d1ffeb3f31522c83a424a3e44e1adb7c328e7d0': Import translations. DO NOT MERGE Change-Id: I42e937d1eda912982139c179180f7f31a5332b28
| * | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: ↵Martijn Coenen2016-05-240-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c48b7447d2 am: a9e2a64b85 am: 09d08c1236 -s ours am: 5919171c49 -s ours am: 81d0474ea2 am: 8342757982 am: 90de9afb72 -s ours am: 494ac54c36 am: 5a5fd5b348 am: b0e5b5e872 am: f17a0af6f4 -s ours am: 2e8193cca1 * commit '2e8193cca1c5e7c55cc9df51e860982f8af41009': Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) Change-Id: I23f706156a38c5a2153ac0123d2ed2edbb9ebc71
| * \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: ↵Martijn Coenen2016-05-240-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ce4550ebe am: 6e4576cdd4 am: 12fa8f2f6d am: a8ef49a547 am: a76659399f am: f5028b8c47 am: e4758afd25 am: ea83c82cfd * commit 'ea83c82cfdd8edb3670211d02a04a44fea361c6a': Verify setForegroundDispatch caller is in foreground. Change-Id: I41b3d250900536b76a8d753f9a9c01b783c5e3da
| * \ \ \ \ \ \ Merge "Verify setForegroundDispatch caller is in foreground." into nyc-devMartijn Coenen2016-05-241-1/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f164556dc9 * commit 'f164556dc9795b716ba6cf8f748a18ebcaa0a149': Verify setForegroundDispatch caller is in foreground. Change-Id: I3852274a754d83c374df0717a0763e618c28cc70
| * \ \ \ \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e492cc8855 -s ours * commit 'e492cc88557c7cddb9f0a36d915fd6c93a51071f': Import translations. DO NOT MERGE Change-Id: I94e8b529417f323c7d26fb3294949fdd426f5f2d
| * \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cb47a81996 -s ours * commit 'cb47a81996f05e6e360363333fbdcc5f7638ca8e': Import translations. DO NOT MERGE Change-Id: I536b1b42c28744729d70a132813ad3a20e8ff272
| * \ \ \ \ \ \ \ \ \ Fix API review comments, add remove callback.Martijn Coenen2016-04-281-34/+81
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0634b25 * commit '0634b25a05b6c572f2f53ba011de28e75f1063a9': Fix API review comments, add remove callback. Change-Id: I76663ce6d28785e3ecf5902b2c1a44cce033970e
* | | | | | | | | | | | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-08-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new interface was added to INfcAdapter for vendor-specific extensions and additional features. It needs to be implemented in all implementations of the interface. Change-Id: I9aa8b94cfbb04133d67c2272c82409cf7db45fec
* | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-230-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-050-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-280-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-120-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | | * | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-050-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-310-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-300-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-240-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-080-0/+0
| | | | | | | | | | | | |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 11:44:57 +0000