summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-05-1511-330/+165
| | | | Change-Id: Ic2e75ecc2fa54d8c92adb4798d84e9c3d19f83b6
* Import translations. DO NOT MERGEEric Fischer2012-05-1417-510/+255
| | | | Change-Id: I708d501c8816ad9613b1625725f9da3d530cadd8
* Import translations. DO NOT MERGEEric Fischer2012-05-1148-2/+1442
| | | | Change-Id: I6209e0962febfa0ec06adebc46d435a249f51f72
* UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-104-5/+90
| | | | | | | | If we find a BT device to pair through NFC and we haven't seen it device before, request confirmation before pairing it. Bug: 6092058 Change-Id: I34fc638fbdb152a48e90644f9a34cc1a0b942de2
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-106-113/+307
| | | | | | | | | | - Implemented handover select with carrier power state - Delay OPP send if remote carrier is activating - I18n for all handover components - Cleanup old handover transfers Bug: 6411485 Change-Id: I84aac3a7c7e703a1fcb423b6016cd9fa3d33d9b1
* Call right Bluetooth enable API.Martijn Coenen2012-04-261-1/+1
| | | | Change-Id: Iff926bce1d3b00fe301195b6e3d341631c58fe29
* Merge "Latest changes for Bluetooth Beam."Martijn Coenen2012-04-244-39/+390
|\
| * Latest changes for Bluetooth Beam.Martijn Coenen2012-04-204-39/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Receive transfer notifications and status info from Bluetooth, to show progress using Notifications. - Added power manager, to keep track of BT power state, and turn BT off if possible. TODO: - UI for failed operations (ie transfer failed, Bluetooth enable failed). - Cleanup of transfer list - Make sure BT doesn't connect to other peripherals or isn't connectable. Change-Id: I31450f589bbaeb72ee8c450c5019f00f0190b7aa
* | Fix to avoid a semaphore issue during the SE opendanieltomas2012-04-201-4/+25
| | | | | | | | | | | | | | This fix is handling a new semaphore dedicated to the SE Notification to avoid the semaphore desynchronisation. Change-Id: I2e735247897a88eaddafcee0edbf3e5a89e18155
* | Added shared prefs for SE wired modeSunil Jogi2012-04-205-17/+70
| | | | | | | | | | | | | | | | | | When SE is in wired mode shared prefs sets the se_wired to true, when SE is no more in wired mode shared prefs sets se_wired to false. Default value for se_wired is false. se_wired shared pref is set during the NFC initialization. Change-Id: I9a3565c23035802895c8e99c671483c808312e0e
* | Updated disable methodSunil Jogi2012-04-201-2/+5
| | | | | | | | | | | | | | Updated disable method so it can be used for phone shutdown and also can retain the state of NFC Adapter. Change-Id: I216e68b1d08d3e6d97cb82ad13cd3366c480d757
* | Added delay before NFC system recoverySunil Jogi2012-04-202-0/+2
|/ | | | | | | Added delay before NFC system recovery if SE is in wired mode to complete possible pending transaction. Change-Id: I74f04e6d66342b94184083141c5d62341bdf209b
* Import translations. DO NOT MERGEEric Fischer2012-04-161-1/+1
| | | | Change-Id: Iebd5151bca71a1d3e13492d2a43b2571dea12cac
* Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-131-1/+1
|\
| * Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
| | | | | | | | Change-Id: Ie30e2fa88f9f4ffaa4570ae9f51221b6b4f8b25e
* | Support for the new Uri[] Beam push API.Martijn Coenen2012-04-123-36/+57
|/ | | | | | Support multiple URIs, move query for the mime type to NFC service. Change-Id: Ib055efca843b41f6d29cda7d67b23f4b9946113c
* Fix backup key for Nfc.Martijn Coenen2012-04-061-1/+1
| | | | | | This became invalid when we changed back to com.android.nfc. Change-Id: I503223bd7b7ae0ac7409d94708cd0819a92b9b06
* Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
| | | | Change-Id: Ib9520b53d699a79d9a7c09cdb3eb27c4e001d7fd
* Add support for making Mifare Classic readonly.Martijn Coenen2012-04-053-7/+19
| | | | Change-Id: I7572274dd74d8f9c3f0c80bdccf3d30707c91c3f
* First cut at Bluetooth BeamNick Pelly2012-04-045-11/+208
| | | | Change-Id: I616fd57b7822d703280ec960b84cf8c5ced6719d
* Merge "Support for querying extended length APDU support."Martijn Coenen2012-04-043-0/+12
|\
| * Support for querying extended length APDU support.Martijn Coenen2012-04-023-0/+12
| | | | | | | | | | Bug: 5813943 Change-Id: I1274e3c47203e30cedefb57049738f97122de4b1
* | Merge "Allow applications to disable default Beam behavior."Martijn Coenen2012-04-041-13/+43
|\ \
| * | Allow applications to disable default Beam behavior.Martijn Coenen2012-04-041-13/+43
| |/ | | | | | | | | | | | | | | | | | | | | By adding a meta-data entry to the application section of the applications manifest: <meta-data android:name="android.nfc.disable_beam_default" android:value="true" /> Bug: 6257668 Change-Id: I73c27d8c642acd85f678fb42b4379f6bc21189b9
* | Merge "Remote debug logging info."Nick Pelly2012-04-031-1/+1
|\ \ | |/ |/|
| * Remote debug logging info.Nick Pelly2012-04-031-1/+1
| | | | | | | | Change-Id: I384990772c2c457207ba3116ace12e7d7b2c71b4
* | Merge "Let connect() fail with an I/O exception if tag has left the field."Martijn Coenen2012-03-301-0/+4
|\ \
| * | Let connect() fail with an I/O exception if tag has left the field.Martijn Coenen2012-03-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because connect() can sometimes be implemented without any I/O, (usually between transitions to/from the NDEF technology), it does not always notice when a tag has left the field. Since we promise in the API docs that it does, fix it by checking (cached) presence. Change-Id: Ie6ad1b5dec3621051e395d3be0d0e09615e53ebc
* | | Merge "Remove permissions check from the TagService."Martijn Coenen2012-03-301-24/+2
|\ \ \ | |/ /
| * | Remove permissions check from the TagService.Martijn Coenen2012-03-291-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow apps to call getNfcAdapter() and check if NFC is enabled without having the NFC permission. Added a permission check inside the TagService methods itself, and removed obsolete method. Bug: 5928657 Change-Id: I27c510ab7c3cbbda8e58e486100ede83312ce0dd
* | | Merge "Fix NPE when there's NDEF data we can't dispatch."Martijn Coenen2012-03-291-1/+2
|\ \ \
| * | | Fix NPE when there's NDEF data we can't dispatch.Martijn Coenen2012-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 6135087 Change-Id: Ib2161c6125b6592db8ca2d89a1959e20f54455eb
* | | | Merge "Get rid of getLastError()."Martijn Coenen2012-03-293-9/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Get rid of getLastError().Martijn Coenen2012-03-293-9/+2
| | | | | | | | | | | | | | | | | | | | | Was only used for one call into the service, and it wasn't even correct in that case. Change-Id: I6c7d9d137783fde9341e119402e6823776c711b7
* | | Merge "Don't crash on passing invalid data to NfcService."Martijn Coenen2012-03-291-0/+2
|\ \ \
| * | | Don't crash on passing invalid data to NfcService.Martijn Coenen2012-03-281-0/+2
| | | | | | | | | | | | | | | | Change-Id: Ibec1e2adb13a1f60bad1a573c9bf1f93d5cd4bc6
* | | | Merge "Keep static NDEF in application rather than NFC Service."Nick Pelly2012-03-292-15/+9
|\ \ \ \
| * | | | Keep static NDEF in application rather than NFC Service.Nick Pelly2012-03-282-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we make an IPC callback during Beam for static NDEF, instead of an IPC every time the static NDEF changes. This results in less IPC, and the latency increase during Beam is not measurable. This fixes a bug where a crashed application still leaves its static NDEF message inside NFC service. Bug: 5199662 Change-Id: Id4879356b2b2b0d65ce3183d7a1bda9cde455f2c
* | | | | Merge "Dejank Android Beam animation."Martijn Coenen2012-03-284-486/+582
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Dejank Android Beam animation.Martijn Coenen2012-03-284-486/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After profiling, it turns out the Beam animation was mostly janky because of the initial buffer allocations that take place in the graphics driver. Modified both the animation and firefly renderers to swap the buffers three times before drawing anything, thereby making sure the buffers are allocated. Do not scale the screenshot while rendering fireflies, as that can cause jank as well. Also modified the FireflyRenderer to keep most of its state alive between subsequent Beams, causing it to come up faster. Cleaned up some old code and added documentation. Change-Id: Ica231861dd7ede178ad2ec1ab09aa00d1c876624
* | | | Merge "Update URL from Market to Play. Add feature parameter."Nick Pelly2012-03-281-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Update URL from Market to Play. Add feature parameter.Nick Pelly2012-03-211-2/+2
| |/ / | | | | | | | | | Change-Id: Ie8d0f65f7055e8bdca1e2f3b322a5b9a280ea2d2
* | | Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | empty -s ours merge Change-Id: I3dc0cefcec9629e02690a9fc0cd63c8beefe7718
| * | | Use the new "appliance" ui mode configuration to determine whether to show ↵Joe Onorato2011-12-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | nfc confirmation ui. Change-Id: Iebad3ee6a40341b963ecf118f8d46f08b6478a25
| * | | am 985dcef8: Fix Beam&Tag failures after opening NFC-EE.Nick Pelly2011-12-071-22/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '985dcef867fcdb1afaca0fc478ec46dacf22b654': Fix Beam&Tag failures after opening NFC-EE.
| * \ \ \ am 16ac4580: Import revised translations. DO NOT MERGEEric Fischer2011-12-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '16ac4580f8bc8a58d88a949b8d2fce25c1f04bd1': Import revised translations. DO NOT MERGE
| * \ \ \ \ am 92250f5c: Fix mismatched link()/unlink() causing NFC-EE to be stuck open.Nick Pelly2011-12-011-14/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92250f5cc5e34549985c31a053feff85b21c60c0': Fix mismatched link()/unlink() causing NFC-EE to be stuck open.
| * \ \ \ \ \ am 951dad2b: Restore deleted string still referenced from manifest.Eric Fischer2011-11-291-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '951dad2b5af6be7c1b0490153f5c3f1f727da64f': Restore deleted string still referenced from manifest.
| * \ \ \ \ \ \ am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA ↵Martijn Coenen2011-11-282-75/+61
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | technologies." into ics-mr1 * commit '3a6751007b70265fc69019f59f308246cad76157': Fix NdefFormatable not showing up for NfcA technologies.
| * \ \ \ \ \ \ \ am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic ↵Nick Pelly2011-11-218-16/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nfc.apk" into ics-mr1 * commit 'e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d': Replace vendor specific NfcGoogle.apk with generic Nfc.apk
generated by cgit v1.1 at 2025-03-30 13:08:00 +0000