summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Add FLAG_ACTIVITY_NEW_TASK to viewIntentDoris Liu2012-09-071-3/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous CL that set FLAG_ACTIVITY_NEW_TASK flag in pendingIntent did not fix the bug. The flag needs to be set in the view intent. Bug: 6925612 Change-Id: Ibe5892c575fdf904c800c726122c59be6af02685
* | | | | | | | | | | | | | am 2bc17929: Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bc17929536528973571087813cb9746ea4947a6': Use NFA_DM_DISC_DURATION_POLL from config file.
| * | | | | | | | | | | | | Use NFA_DM_DISC_DURATION_POLL from config file.Paul Chaisson2012-09-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the poll duration ("NFA_DM_DISC_DURATION_POLL") from the conf file if one is configured. Change-Id: If17d402cbe8505b096a168640f99b88f7e3b6e48
* | | | | | | | | | | | | | am cdf5b0e0: Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-072-451/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdf5b0e0c3cdd1b60a212fd4df510fb1e50bcbe5': Remove old NPP->SNEP redirect code.
| * | | | | | | | | | | | | Remove old NPP->SNEP redirect code.Martijn Coenen2012-09-062-451/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was used when Android did not support SNEP natively yet. The current Android behavior is to automatically try SNEP first, then fall back to NPP. Change-Id: Ifb1df3a5439cc1a7b939b4ae1dc70135d9c63a25
* | | | | | | | | | | | | | Merge "Do not dispatch empty NDEF tags as NDEF_DISCOVERED." into jb-mr1-devMartijn Coenen2012-09-061-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do not dispatch empty NDEF tags as NDEF_DISCOVERED.Martijn Coenen2012-09-061-1/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid encouraging sloppy filtering. This was actually already the behavior pre-JB. Change-Id: I556f250db086b70345123a151378728080b4779c
* | | | | | | | | | | | | | am 3463d49a: Correct spelling.Evan Chu2012-09-062-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3463d49a81556279bb0c4c74d9f4c9fd49ee61af': Correct spelling.
| * | | | | | | | | | | | | Correct spelling.Evan Chu2012-09-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie747c06a0a5161ad5479f93cbc56e482ed7da33c
* | | | | | | | | | | | | | am 7e5bdc93: correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e5bdc93fb55d2090c4b32bff811abf4c39b2e52': correctly handle P2P congestion event
| * | | | | | | | | | | | | correctly handle P2P congestion eventEvan Chu2012-09-061-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly handle NFA_P2P_CONGEST_EVT to prevent race condition. Change-Id: If255ade96867d45b2a7cff1cb3d6e4cbc2d883d3
* | | | | | | | | | | | | | am 08030f1c: handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08030f1c2a13eca1acc67b9d0763a3b6a2706f02': handle NACK, ACK for Mifare Ultralight
| * | | | | | | | | | | | | handle NACK, ACK for Mifare UltralightEvan Chu2012-09-063-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01652900: During trasceive operation for Mifare Ultralight, handle NACK and ACK responses properly Bug: 7047415 Change-Id: I778a2bbbcd3fff47b0da73ec37d76bf81708d931
* | | | | | | | | | | | | | am cf83b532: Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | / / / / / / / / / / / / | |/ / / / / / / / / / / / |/| | | | | | | | | | | | * commit 'cf83b532b9f3fec2a9b95ccc7bccf91526cf0b31': Remove "brcm" in names
| * | | | | | | | | | | | Merge "Remove "brcm" in names" into jb-broadcom-nfcMartijn Coenen2012-09-068-63/+62
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove "brcm" in namesEvan Chu2012-09-068-63/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01642677. Remove "brcm" in names. Change-Id: Ic3a08abfeb2808d2a0b01402a76d9864b099ef49
* | | | | | | | | | | | | | am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | * commit 'db216e63dad45973ff4992098229208a518d658f': Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.
| * | | | | | | | | | | | Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-041-1/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6925612 Change-Id: I37f49a150c4fc1763b2121e46fedf79d662b0a2b
* | | | | | | | | | | | am f340f1a0: Upgrade to stack NFA_MI_1.03.36Evan Chu2012-09-042-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | | * commit 'f340f1a071a54c6ea4644fcef45c784a9be3c19a': Upgrade to stack NFA_MI_1.03.36
| * | | | | | | | | | Upgrade to stack NFA_MI_1.03.36Evan Chu2012-08-312-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79510a45e8a552626f0473000e23d0fc6888ee33
* | | | | | | | | | | am 8e9cdd78: Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e9cdd7891bc1d6589b6d51b7c39efc87a64ba5e': Create JavaClassConstants.h to store some global names
| * | | | | | | | | | Create JavaClassConstants.h to store some global namesEvan Chu2012-08-2811-33/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create JavaClassConstants.h to store some global names Change-Id: I918d9e8f6db646f637cddbebbc2c4e5c5495623d
* | | | | | | | | | | am dfc52b4b: In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | | * commit 'dfc52b4bafc435e72d25aaba736612352bfd0581': In SyncEvent class, only unlock mutex once
| * | | | | | | | | In SyncEvent class, only unlock mutex onceEvan Chu2012-08-286-96/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SyncEvent class, only unlock mutex once. Change-Id: I0fb797c9e6e8ea793fd38abd72a0c2780a734e95
* | | | | | | | | | am d1235cf7: Don\'t report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | * commit 'd1235cf7c2d0839264ccf90e9be7e19b66b58b6a': Don't report empty NDEF tags as formattable.
| * | | | | | | | Don't report empty NDEF tags as formattable.Martijn Coenen2012-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was regression from a JB change. Change-Id: Idbd92abf797478ec827dc26d6e825e2a6805356d
* | | | | | | | | am 59ff0d6e: During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | * commit '59ff0d6e6f4de4703a4489144a4311405eeead5a': During nfcManager_disableDiscovery() go to power-off-sleep mode.
| * | | | | | | During nfcManager_disableDiscovery() go to power-off-sleep mode.Evan Chu2012-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLTH01634648: During nfcManager_disableDiscovery() go to power-off-sleep mode when secure element is not selected. Change-Id: I85c37fa635a90fdc8c90b5a86fe1d3e091d421d4
* | | | | | | | Use new display manager API.Jeff Brown2012-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d40a33bf11379845464f4072471c168f9dccf75
* | | | | | | | am e8e49093: Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8e49093826aa8309f4e16e5cd02174829e0310a': Log NFC controller firmware version.
| * | | | | | | Log NFC controller firmware version.Martijn Coenen2012-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALOGD is now squelched by default. Moved it to ALOGE. Change-Id: I3bb7601e65d01d8d01a95902a0be95c7e1a3426f
* | | | | | | | am 72a693f6: Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '72a693f626c4c766f8f8d835c28643252301fef5': Remove unused functions; correct spelling
| * | | | | | | Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused functions; correct spelling Change-Id: I6ecf17f8cf8eeae831ba3fcc0a2eb492332c0cb6
* | | | | | | | am 55dbe428: Remove gJniVersion; add thread-synchronizationEvan Chu2012-08-166-61/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '55dbe428a7134ec82c5356f4f8e5fd7778374509': Remove gJniVersion; add thread-synchronization
| * | | | | | | Remove gJniVersion; add thread-synchronizationEvan Chu2012-08-166-61/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gJniVersion. Add thread-synchronization for obtaining a new JNI handle. Change-Id: I23e05c95fd90005f6ef1cac69e1e07f0b9612227
* | | | | | | | am 5e100450: Don\'t call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | * commit '5e100450dac446c851690af1a522446fa406e4ad': Don't call applyRouting on disable().
| * | | | | | Don't call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original patch from Chih-Weih Huang <cw_huang@htc.com>. Change-Id: I15b129d318d125cf67aba83d16441c6d52bb193a
* | | | | | | am 7de0211f: Reduce compilation warnings in NFC JNI.Evan Chu2012-08-152-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | * commit '7de0211f2c47500f921634d9af18900826000616': Reduce compilation warnings in NFC JNI.
| * | | | | Reduce compilation warnings in NFC JNI.Evan Chu2012-08-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba0dab66be054ca1b0bc0f477c1107909df65cda
* | | | | | am 5c7b8d9b: Remove whitespace from NFC NCI JNI.Evan Chu2012-08-1330-772/+746
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | * commit '5c7b8d9beeb46cba30bffaf94945ef6fc55e8a76': Remove whitespace from NFC NCI JNI.
| * | | | Remove whitespace from NFC NCI JNI.Evan Chu2012-08-1030-772/+746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Logging changes - Upgrade to stack NFA_MI_1.03.33 Change-Id: Iba2af1af49a261de50f79572b478838e2bdc890f
* | | | | am c6cdbf21: NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c6cdbf21958178025010c6bed797ff193c89884f': NfcService: hold a wake lock around transceive().
| * | | | NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6629750 Change-Id: Idee36983952b4ba593464f72188c6fb702c59f7f
* | | | | am 341fbf46: Support for setting p2p target/initiator modes in NCI.Martijn Coenen2012-08-093-0/+44
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | * commit '341fbf46e459073c929cb20fcb231ad981b0c67d': Support for setting p2p target/initiator modes in NCI.
| * | | Support for setting p2p target/initiator modes in NCI.Martijn Coenen2012-08-093-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows selectively enabling / disabling p2p modes in the NCI stack. TODO: - Support selecting individual Nfc-F speeds (212/424). - Support disabling initiator Nfc-A / Nfc-F just for NFC-DEP. Change-Id: I55a08bd83640b45e2d8346587031f49213a0860b
* | | | am 3c47e69e: Fix one last user of astl to use stlport instead...Elliott Hughes2012-08-081-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3c47e69e330d6d2890afae3b0b447954fbb97911': Fix one last user of astl to use stlport instead...
| * | | Fix one last user of astl to use stlport instead...Elliott Hughes2012-08-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This wasn't directly referencing libastl, so I didn't find it first time round. A top level rebuild without external/astl caught it. I've since grepped and there are no other projects that pull in the include files without the shared library. Change-Id: I2dd06727098744076a7e115d05a8139029ff977a
* | | | am 8d6ea79d: Allow different default MIU / window sizes.Martijn Coenen2012-08-087-14/+95
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8d6ea79dad7c25f592722faf47709e1b918d4c21': Allow different default MIU / window sizes.
| * | | Allow different default MIU / window sizes.Martijn Coenen2012-08-077-14/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new NCI stack can deal with larger MIU and rw sizes, which give us better p2p throughput. Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5
* | | | am 2d57efb7: (-s ours) am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release ↵The Android Open Source Project2012-08-080-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | - do not merge * commit '2d57efb70a92553623370786bfede151603d3305':
generated by cgit v1.1 at 2025-01-10 22:30:10 +0000