summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am 04a29c85: Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '04a29c85c9bdbf0b25171332013934c3436ab0ec': Prevent SE from being opened while target is in field.
| | * | | | Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where an attempt to open the SE while the NFC Controller is in initiator (reader/writer or P2P Initiator) mode would cause a strange error response, and all further attempts to open the SE fail. Change-Id: I6401f644c73a993433cb73fee2eff8c11ededa1d
* | | | | | am e1e26c9d: am 7aedb9c2: Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * commit 'e1e26c9d0f067b2e52bcbfc59a87eba489039fa2': Patch to enable the Card Emulation detection mechanism
| * | | | am 7aedb9c2: Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '7aedb9c2ae08b424c58628261befa97bdf0052e1': Patch to enable the Card Emulation detection mechanism
| | * | | Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch permit to enable Card Emulation detection mechanism, via an EEPROM setting, to avoid any card emulation notification when two Nexus S are in front of each other. Change-Id: I200a2a1b3ce31863a1684cd0968cd0eec008885a
* | | | | Adding content description for accessibility.Svetoslav Ganov2011-07-211-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: If4b8b63a702de6f048b6476e8f08d6d5442a72d5
* | | | | Do foreground 0-click before preparing Bluetooth for dropbox.Nick Pelly2011-07-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes 0-click fast when Bluetooth is off. Change-Id: I3ced104ddbf54abe9dd072b88871d2ca8a94919e
* | | | | Merge "Fix synchronisation for 0-click setting."Martijn Coenen2011-07-211-10/+13
|\ \ \ \ \
| * | | | | Fix synchronisation for 0-click setting.Martijn Coenen2011-07-211-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25fa9ff4430267dd5822f226d1ac8f19fb9a4c05
* | | | | | Reconcile with gingerbread-mr4-releaseThe Android Open Source Project2011-07-210-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Change-Id: I9debca836adf291be62e2bad65f7b059318c8acb
| * | | | - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allowsRobert Tsai2011-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts. Change-Id: I833bb2afae06778a0e4bdd5f5d25374636885f42
| * | | | Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-303-11/+141
| | | | | | | | | | | | | | | | | | | | Change-Id: I4fe95c6cff9c50eef64bd99de415e66e7174b46a
* | | | | Support for enabling/disabling zero-click sharing.Martijn Coenen2011-07-211-6/+58
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf05dca23174952e412afdd2c90ca9efad31d3a0
* | | | | Merge "Support for getTimeout() (NFC service)."Martijn Coenen2011-07-214-11/+71
|\ \ \ \ \
| * | | | | Support for getTimeout() (NFC service).Martijn Coenen2011-07-204-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4492175 Change-Id: I289e40d1527e7b570e8fd46f9968094b92a31902
* | | | | | Remove the My Tag handling.Jeff Hamilton2011-07-201-121/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5048185 Change-Id: Ic25091ee4975d1c601e0f56abda5ae25c09a62f8
* | | | | | Bluetooth dropbox for out-of-band transfersBen Dodson2011-07-209-25/+627
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dropbox for ME profile. Transiently turn on Bluetooth. Change-Id: I81556a67872e7e0ac7c66c0376549adc5f0c168d
* | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-07-180-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | Change-Id: I35c08abbdbc21980a33b8895ff06a72e9531f096
| * | | | reset back to latest, and keep historyandroid-merger2011-07-130-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | temp reset to 39, and keep historyandroid-merger2011-07-120-0/+0
| | |\ \ \ | | |/ / / | |/| | |
* | | | | am 9e6b5d1f: am b3d770c4: Merge "- Properly initialize ↵Nick Pelly2011-07-151-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | NfcService.mEeRoutingState to ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts." into gingerbread * commit '9e6b5d1f092fab35e497f81035586afae529cda6': - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts.
| * | | | am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingState to ↵Nick Pelly2011-07-151-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts." into gingerbread * commit 'b3d770c4ff05992f81f2d172e6d2c514443674a5': - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts.
| | * | | Merge "- Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This ↵Nick Pelly2011-07-141-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts." into gingerbread
| | | * | | - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allowsRobert Tsai2011-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts. Change-Id: I833bb2afae06778a0e4bdd5f5d25374636885f42
* | | | | | resolved conflicts for merge of 399a21b8 to masterKenny Root2011-07-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Ia3f4e08598504039eca70aa95e7ddd590e903881
| * | | | | am c91dcc54: Do not write to EEPROM when turning screen on/off.Nick Pelly2011-07-151-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c91dcc5473a79bb2a024e8196e3cf287448f5e4b': Do not write to EEPROM when turning screen on/off.
| | * | | | Do not write to EEPROM when turning screen on/off.Nick Pelly2011-07-121-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The card emulation duration is kept in EEPROM, and does not need to be re-configured. Just turning the polling loop off is enough. Change-Id: I25ee443d04635b3434dabf675ad5a32c4f0f468c
* | | | | Launch ACTION_MAIN intents that don't support CATEGORY_DEFAULT.Ben Dodson2011-07-121-5/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie191aaff29d11fe9f65038f8ed5a5c13b3c54ed1
* | | | | Merge "Allow dispatch to a specific package"Nick Pelly2011-07-121-3/+50
|\ \ \ \ \
| * | | | | Allow dispatch to a specific packageBen Dodson2011-07-111-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I511dd319dd1568ef7b59621b30a2ff144978e69c
* | | | | | Fix issue: NFC polling does not start on screen on with unlocked keyguardNick Pelly2011-07-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic at ACTION_SCREEN_ON was wrong. Change-Id: I992ec9ac851ce4f803b7c17b6ee3488a8b94aa92
* | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-07-060-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Change-Id: I66514d6155790955873c31f42e0a5dbd3ff5e6f2
| * | | | Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4967769 Change-Id: I7a72cbe831d4b3f44bed7feeea8abaf468cdc19b Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Merge "Add the NDEF tech for tags coming in over P2P."Jeff Hamilton2011-06-301-2/+8
|\ \ \ \ \
| * | | | | Add the NDEF tech for tags coming in over P2P.Jeff Hamilton2011-06-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56a51cf9dbf2b0be7f4e1391188cb8e73fc61be4
* | | | | | resolved conflicts for merge of 23cb1387 to masterNick Pelly2011-06-301-10/+14
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | Change-Id: Id0fbebca8ace7425a28bd34b5689b3724ccf69fa
| * | | | am e7a398f2: Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'e7a398f2f0256a4a80a4ee08b70d48dbfd8da6d2': Do not change NFC on/off preference while executing SE reset.
| | * | | Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4967769 Change-Id: I7a72cbe831d4b3f44bed7feeea8abaf468cdc19b Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Properly merge b5165e13 to master.Nick Pelly2011-06-283-3/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b7019e94346046d4e0834531651c372c754e0a3
* | | | | resolved conflicts for merge of b5165e13 to masterNick Pelly2011-06-283-11/+141
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ie4f9f57b7969979a4db2ddcb795aed9fc3cd592b
| * | | | am 2c37e6a8: Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-283-11/+141
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2c37e6a839cecf5638911af357a2ea7aec6093a5': Patch to support New PN544 firmware events in the NfcService
| | * | | Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-273-11/+141
| | | | | | | | | | | | | | | | | | | | Change-Id: I4fe95c6cff9c50eef64bd99de415e66e7174b46a
* | | | | Merge "Remove unnecessary param from profile vcard URI."Dave Santoro2011-06-271-1/+0
|\ \ \ \ \
| * | | | | Remove unnecessary param from profile vcard URI.Dave Santoro2011-06-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The profile/vcard URI already restricts itself to the user's "me" profile. The extra parameter is only necessary if the caller is asking for the profile contact to be allowed to be returned in a list of contacts. Change-Id: I286e94dffb853f87230a398a75c06ad7039f4e86
* | | | | | Merge "Add correct permissions for sharing me profile."Jeff Hamilton2011-06-271-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add correct permissions for sharing me profile.Martijn Coenen2011-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a4fb18540b4841bc8c65089b1ae22b3a1a2fc96
* | | | | | Merge "Revert "Temporarily disable FW update for first cut of Nexus Prime ↵Nick Pelly2011-06-231-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | bringup.""
| * | | | | | Revert "Temporarily disable FW update for first cut of Nexus Prime bringup."Nick Pelly2011-06-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a89585090cbb4db53546a93e260b3d3d2ab6b35.
* | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-230-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: Ic71f3a72ba6db620a163053d60c365297e08ddde
| * | | | | | Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id89207194a87e918aee2493c8c0fa93a97a1ff4a
generated by cgit v1.1 at 2025-02-13 22:33:28 +0000