summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
|\ \ \
| * | | Close sockets on failureBen Dodson2011-06-172-1/+9
| | | | | | | | | | | | | | | | Change-Id: I66ec6b12ba6847948e6a69857ea2d9e3c5ee2e17
* | | | Play sounds for start, end, and error.Jeff Hamilton2011-06-172-50/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs some cleanup to handle the error states better, but works ok for now. Change-Id: I803c339de593acfe5bb7f1007a965f203e0e1a30
* | | | Merge "Updates for SnepServer thread safety"Ben Dodson2011-06-161-6/+36
|\ \ \ \
| * | | | Updates for SnepServer thread safetyBen Dodson2011-06-161-6/+36
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea481089edf1a59f738367ec7e6a57c6403d96fd
* | | | | Merge "automatically share packages of user apps that don't support nfc"Ben Dodson2011-06-162-2/+36
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | automatically share packages of user apps that don't support nfcBen Dodson2011-06-162-2/+36
| | | | | | | | | | | | | | | | Change-Id: I531d8cb50a334a93f0e44f90cbab4ebc1f70d4b2
* | | | Merge "Finer-grained synchronization"Ben Dodson2011-06-162-35/+58
|\ \ \ \ | |/ / /
| * | | Finer-grained synchronizationBen Dodson2011-06-162-35/+58
| | | | | | | | | | | | | | | | Change-Id: Ia69d2500c160fc7cacfbf8729d4e717b3676fcf2
* | | | resolved conflicts for merge of 8bda4f3e to masterNick Pelly2011-06-152-1/+32
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I558cc850a3d799271c733807ca63a66487db2839
| * | am 2edb3ee5: Fix NFC service wake-lock, again.Nick Pelly2011-06-152-3/+33
| |\ \ | | |/ | | | | | | | | | * commit '2edb3ee5e28ab719a3bb17b8d76b2b588405be9a': Fix NFC service wake-lock, again.
| | * Fix NFC service wake-lock, again.Nick Pelly2011-06-122-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Put a watchdog on the NFC Service disable path. All the bug-reports show we were stuck in _disable(), watch-dog this path (10 seconds). 2) Only attempt a SE reset once, even if it fails the first time. All the bugs reports should the _disable() was due to SE reset on first boot. 3) Grab the NFC service lock before the wake-lock. So even if someone has NFC service lock, at least we don't hold a wake-lock waiting for it. Bug: 4581084 Change-Id: Ic9829dddde8d0c67cf0e8e4912357fa2902faa11
* | | Merge snep p2p to masterBen Dodson2011-06-159-186/+1015
| | | | | | | | | | | | Change-Id: Ic629c9a2ad348c1f352f39d7fc2be04edcf627e7
* | | First pass at an abstraction of the NFC stack.Jeff Hamilton2011-06-135-278/+502
| | | | | | | | | | | | | | | | | | | | | This moves some of the stack functionality behind interfaces that the NFC service uses. Change-Id: Ia377b8d0b9f57a25ac72a5f650fd25c35df72de0
* | | Relocate the libnfc-nxp Java bridge sources.Jeff Hamilton2011-06-138-20/+17
| | | | | | | | | | | | Change-Id: I0b743245d60bf9c47ce84ec0ab7fd8c5b6202ec9
* | | Support for setting the NfcA transceive timeout (NFC Service).Martijn Coenen2011-06-132-21/+11
| | | | | | | | | | | | Change-Id: Iec7b949f487f3b9cdd4729ce99c3a4b2718b9b6a
* | | Moar NfcService cleanup.Nick Pelly2011-06-106-324/+14
| | | | | | | | | | | | | | | | | | | | | - Pulled polling loop configuration out of NfcService, to NativeNfcManager.cpp - Removed lots of dead code Change-Id: Id8d3b590feb24e6065d4afa34f004d9afbacbe5a
* | | resolved conflicts for merge of 8b3098bd to masterNick Pelly2011-06-091-27/+27
|\ \ \ | |/ / | | | | | | Change-Id: I37daa2d765857c007b7b310510afc621a2aa0699
| * | am dfac80d2: Fix regression in NFC-EE close() cleanup path for dead ↵Nick Pelly2011-06-071-27/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | applications. * commit 'dfac80d25dd2816ad5af74cc4131b74134cc81b7': Fix regression in NFC-EE close() cleanup path for dead applications.
| | * Fix regression in NFC-EE close() cleanup path for dead applications.Nick Pelly2011-06-021-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | The regression occured when we switched to certificate based checking for NFC-EE access control (this switch was only fully completed a few days ago). Change-Id: I43d7adfad020446af8e863e876c59caf3b852920
* | | Merge "Added support for rediscovering a Tag."Martijn Coenen2011-06-092-123/+191
|\ \ \
| * | | Added support for rediscovering a Tag.Martijn Coenen2011-06-082-123/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds basic support for rediscovering the currently connected tag. At the moment rediscovering the same tag is not well supported by libnfc. The real usecase for rediscover is actually run-time adding and/or removing the Ndef and NdefFormatable technologes, and since we detect these in the upper layers of the stack anyway this makes the implementation a lot simpler. This change also required a cleaner split between connected technologies and connected handles. Connected technologies are something that only the Java part of the API is concerned with. Each technology is mapped to a handle, which is how libnfc refers to a tag. Previously we used the connected technology to derive the connected libnfc handle, but since this change allows run-time removal of technologies *without* disconnecting from a handle we need to keep track of them separately. Bug: 3378764 Change-Id: If4725fa266eb37aa17aa67b31491f4bd77b1ee68
* | | | resolved conflicts for merge of fe817189 to masterNick Pelly2011-06-081-21/+45
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I42b37768e9f66e959b5487e4e5409e517202d63a
| * | | am aa122139: Make sure NFC stack is initialized before attempting SE reset.Nick Pelly2011-06-071-25/+49
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'aa122139d77645149c09c9815fd45e7b87ce7170': Make sure NFC stack is initialized before attempting SE reset.
| | * | Make sure NFC stack is initialized before attempting SE reset.Nick Pelly2011-05-311-25/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression at about GRJ46 where phones that had NFC turned off would fail to perform SE reset on first boot of GRJ46 and later. This would prevent NFC from being turned on, and caused NFC service to eat battery. Change-Id: I4714f06e8a3c92a5974851dd1be90b797e3058ac Bug: 4504474
* | | | Merge "Slay the NfcService beast, part one."Nick Pelly2011-06-082-417/+403
|\ \ \ \
| * | | | Slay the NfcService beast, part one.Nick Pelly2011-06-082-417/+403
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out dispatch code into NfcDispatcher.java. It can be pulled out cleanly. Move URI field construction into framework. Change-Id: Ia70c06c5f469b370c532905e1c02f71149cb9ecc
* | | | Implement Felica timeout handling (NFC service).Martijn Coenen2011-06-082-6/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | NFC service interface to set the Felica timeout from the API. Refactored timeout resets to single method - assuming access to the SE in wired mode is exclusive with normal tag access, this should be no problem. Change-Id: I4a4d1c2c6db12582e5ff6cca325fd14fcf286282
* | | am 30f997de: am b8318ada: Merge "Fix a bug with absolute URI processing." ↵Jeff Hamilton2011-06-071-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | into gingerbread * commit '30f997de5f25657e583eda87de8b56638ec49884': Fix a bug with absolute URI processing.
| * | am b8318ada: Merge "Fix a bug with absolute URI processing." into gingerbreadJeff Hamilton2011-06-061-2/+2
| |\ \ | | |/ | | | | | | | | | * commit 'b8318ada928026f1d118ec918260796106b83dd2': Fix a bug with absolute URI processing.
generated by cgit v1.1 at 2025-02-09 23:51:16 +0000