summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Increase priority of EnableDisableTask thread to fix FW download failures.Nick Pelly2011-08-091-0/+10
| | | | | | | | | | | | | | AsyncTask uses THREAD_PRIORITY_BACKGROUND, which is not responsive enough to execute software I2C firmware download with the NXP PN544. Use THREAD_PRIORITY_DEFAULT instead. Software I2C uses the host processor to manually toggle the transport line to indicate each bit. With THREAD_PRIORITY_BACKGROUND there might be high latency between bits. The observed result is that we do not receive the expected "00 00 00" response to a firmware write command - we hang and timeout. Change-Id: I525759837d26009c01304f60a420b5213443d959
* Fix bug where NfcAdapterExtras.get() always fails.Nick Pelly2011-08-091-2/+7
| | | | | | And improve some logging while we're at it. Change-Id: Ia1f5c1a451690bfcf5b9af75e855c09164460561
* A bunch of NfcService improvements.Nick Pelly2011-08-092-527/+662
| | | | | | | | | | | | | o Make enable/disable async, notify with NfcAdapter.ACTION_ADAPTER_STATE_CHANGED o Make NFC enabled/disabled a 4-state machine, managed in EnableDisableTask o Airplane mode support: automatic disable/enable without persisting preference o Rename SE reset to EE wipe for consistency, remove some dead code o Allow EE wipe during airplane mode o Fix thread-safety issues on mObjectMap and a few others o Improve power on/off state machine in prepration for airplane mode support. o Implement dump(): executed by "adb shell dumpsys nfc" Change-Id: I408c38eae8fa1b55c3752cb3bdc1d22a49b5a1e6
* Merge "Turn on polling if NFC service restarts with screen on."Nick Pelly2011-08-081-1/+1
|\
| * Turn on polling if NFC service restarts with screen on.Nick Pelly2011-08-061-1/+1
| | | | | | | | | | | | | | There was a bug where mScreenUnlocked is initialized incorrectly when the screen is on. Change-Id: Id1bc813f6927d23cc317c0f0da074c0cee160fe3
* | 0-click animations: "tap to send" and "tilt to send".Martijn Coenen2011-08-082-43/+103
|/ | | | Change-Id: I771b97bc090ebce07eeb46807c8fb337be703513
* Merge "Launch application if already installed."Martijn Coenen2011-08-052-29/+33
|\
| * Launch application if already installed.Martijn Coenen2011-08-052-29/+33
| | | | | | | | | | | | | | | | | | | | If app doesn't have a foreground NDEF message, both a Market URL and an Android App NdefRecord will now be sent instead. On the receiving side, if the app is already installed, try to launch the apps main activity. If not possible, go to market instead. Change-Id: Iac1d27151d2cae8c561090c92177bca7bb5daa92
* | New NFC animations.Martijn Coenen2011-08-053-137/+314
|/ | | | Change-Id: If62df6f07d1282fe39a6f3ac3a67c7a264e2be77
* Merge "Allow NDEF swap."Nick Pelly2011-08-022-21/+6
|\
| * Allow NDEF swap.Nick Pelly2011-08-022-21/+6
| | | | | | | | | | | | Try normal NDEF dispatch even if the foreground activity pushed NDEF. Change-Id: I6fd17ae14ff3e15b43ffdc9b0304c374ca981c51
* | Merge "Remove the binder interface for LLCP."Jeff Hamilton2011-08-0211-912/+288
|\ \
| * | Remove the binder interface for LLCP.Jeff Hamilton2011-08-0111-912/+288
| |/ | | | | Change-Id: I8d5fd546ecb07f005322eb5f173975dff7820439
* | Animations for 0-click send success / failure.Martijn Coenen2011-08-022-46/+278
|/ | | | | | | | | | | | | | | | | | This implements the following behavior: - The first part of the animation (the screen scaling down) is always played and finished. - Depending on the result, the following animation will either pop the screen back to front (failure), or "clone and swap" (success). Both animations will be fully played, except if there is a new start() request, in which case they are ended immediately. The main reason to fully play both animations is that the LLCP transfer typically completes very quickly, and with me profile removed, none of the animations would ever be visible. I think the animations are short enough not to be annoying, but we can tweak depending on user feedback. Change-Id: Iecd883fec43fad3eeb35f03b6076562b36a10fef
* Turn off ME Profile sharing & BT Dropbox.Nick Pelly2011-08-014-663/+13
| | | | | | Seems like it won't make the cut. Change-Id: Iac7aa00debfe0d8118b28e8651abc200ce41d8ef
* Minor cleanup: change private members to package.Nick Pelly2011-08-012-22/+22
| | | | | | | - remove explicit /* package */ comments - Change some Log.e to Log.w Change-Id: Ibcebcc63cd5e14f3a3d9d1f2482295115667814c
* Fix bug: use foreground dispatch when ndef push is enabled via callback.Nick Pelly2011-08-012-3/+3
| | | | | | The previous code only checked for a static message, not the callback. Change-Id: Ib0f2db42423ca8b11ece7f4b20adb7969911c8ba
* Merge "Fix crash when screenshot fails."Jeff Hamilton2011-07-291-6/+7
|\
| * Fix crash when screenshot fails.Jeff Hamilton2011-07-291-6/+7
| | | | | | | | | | Bug: 5094030 Change-Id: I8eebf6faa2937becd5277b97c71fccdf8bb8816b
* | Pop up notification on first succesful Tap to Share.Martijn Coenen2011-07-281-0/+32
|/ | | | Change-Id: Id2ddeea908af1159e5738e52a92f7f9818496761
* Merge "Play an animation for outbound NFC P2P."Jeff Hamilton2011-07-274-37/+364
|\
| * Play an animation for outbound NFC P2P.Jeff Hamilton2011-07-264-37/+364
| | | | | | | | | | | | | | | | | | Clean up NFC service sound playing. Cancel P2P tasks when the LLCP link is broken. Bug: 4941390 Change-Id: I0710bc7dd9d09ed47a540cb4739890bcc3a4f905
* | resolved conflicts for merge of 5057a591 to masterNick Pelly2011-07-262-100/+113
|\ \ | |/ |/| | | | | | | While I was there, rework of NativeNfcTag.findAndReadNdef() Change-Id: I971403d880f281c8f64d2f9ed60756f6e692e9ae
| * am 2c3f9be8: Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-252-43/+64
| |\ | | | | | | | | | | | | * commit '2c3f9be8111dd454e430ffb327c051ff9d2bba21': Patch to manage TARGET_LOST status in case of Multiple protocol tag
| | * Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-252-43/+64
| | | | | | | | | | | | | | | | | | Plumb status codes up through the stack. Change-Id: Id30e69fff3bb56082ab29d42f166cb12c3061857
* | | 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
* | | Fix synchronisation for 0-click setting.Martijn Coenen2011-07-211-10/+13
| | | | | | | | | | | | Change-Id: I25fa9ff4430267dd5822f226d1ac8f19fb9a4c05
* | | 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-213-0/+14
|\ \ \
| * | | Support for getTimeout() (NFC service).Martijn Coenen2011-07-203-0/+14
| | | | | | | | | | | | | | | | | | | | 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-204-25/+610
|/ / / | | | | | | | | | | | | | | | | | | | | | Use dropbox for ME profile. Transiently turn on Bluetooth. Change-Id: I81556a67872e7e0ac7c66c0376549adc5f0c168d
* | | 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.
| | * - 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
* | | 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
* | | 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-282-1/+66
|\ \ \ | |/ / | | | | | | Change-Id: Ie4f9f57b7969979a4db2ddcb795aed9fc3cd592b
| * | am 2c37e6a8: Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-282-1/+66
| |\ \ | | |/ | | | | | | | | | * commit '2c37e6a839cecf5638911af357a2ea7aec6093a5': Patch to support New PN544 firmware events in the NfcService
| | * Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-272-1/+66
| | | | | | | | | | | | Change-Id: I4fe95c6cff9c50eef64bd99de415e66e7174b46a
* | | 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
* | | Properly merge SE reset timeout fix.Nick Pelly2011-06-221-2/+2
| | | | | | | | | | | | Change-Id: Id429b51625a4ce19851629b82cbc80f00a8ddd98