summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | resolved conflicts for merge of d15714ce to masterNick Pelly2011-06-221-0/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ifd4087685f8ba170af54e0d9c67ae7ae1f49260c
| * | am 5a8844da: NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
| |\ \ | | |/ | | | | | | | | | * commit '5a8844da9bc569aa7289426bf7b96e7eef90abf5': NfcService updates for NfcAdapterExtras API change.
| | * NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
| | | | | | | | | | | | | | | | | | (removing registerTearDownApdus(), adding authenticate()) Change-Id: Ie1b0f7f088317ff3e52721158b0e588dfda14ce4
* | | Hack to fix broken buildBen Dodson2011-06-221-2/+2
| | | | | | | | | | | | Change-Id: I8337c21e02c9e45365f929b20d1ceb9ef6aebb14
* | | am 10577281: am 85a8366a: Set the transceive timeout to 10s when ↵Daniel Tomas2011-06-221-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | executeSeReset() is called * commit '1057728122c5fda8988ef39bdbad83d7fda7c0d6': Set the transceive timeout to 10s when executeSeReset() is called
| * | am 85a8366a: Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
| |\ \ | | |/ | | | | | | | | | * commit '85a8366a75041491a22928f65357c69d112c9925': Set the transceive timeout to 10s when executeSeReset() is called
| | * Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
| | | | | | | | | | | | Change-Id: Id89207194a87e918aee2493c8c0fa93a97a1ff4a
* | | Exchange me profile over NFC using android SNEP service.Martijn Coenen2011-06-223-51/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is Ben's patch with some small modifications: - Added code to retrieve the me profile and transmit/receive it; - Moved local SAP definitions for more clarity. - Removed sending of my tag. Change-Id: Ica85b4491206526e89bc34c23479f9d4489ed1cf
* | | Merge "Close SNEP socket on IOException."Ben Dodson2011-06-201-1/+8
|\ \ \
| * | | Close SNEP socket on IOException.Martijn Coenen2011-06-201-1/+8
| | | | | | | | | | | | | | | | Change-Id: I94b155f80bcb70204d2b15b1bf11a6ec9df6236d
* | | | Merge commit '52eadbdd' into nfcJason parks2011-06-201-2/+10
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Conflicts: src/com/android/nfc/NfcService.java Change-Id: I0cd15dbdc3540cb469d6fc13550006e1ab43b90f
| * | am 84e1e0ad: Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
| |\ \ | | |/ | | | | | | | | | * commit '84e1e0adc2516afd35ebab029a52e764e0490559': Reset the SE when a package that accessed it is uninstalled.
| | * Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
| | | | | | | | | | | | | | | Bug: 4487211 Change-Id: Iad5c641926eb0e121d630d16f8ce02b8b9713cd3
* | | Merge "Close sockets on failure"Ben Dodson2011-06-172-1/+9
|\ \ \
generated by cgit v1.1 at 2024-12-23 17:20:10 +0000