summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 62a89973: am d0387061: Merge "Use new handover intent actions." into jb-devMartijn Coenen2012-05-252-18/+26
|\ | | | | | | | | * commit '62a8997361a059183f2547365a6055db3d45e9c9': Use new handover intent actions.
| * Use new handover intent actions.Martijn Coenen2012-05-252-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | Use the new handover intent actions that allow us to select any mime-type. Also, add unique filename counter before extension instead of after it. Bug: 6561169 Change-Id: I04b83460099b42ba6220d7eb4dcff7a095022304
* | am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get ↵Martijn Coenen2012-05-253-5/+78
|\ \ | |/ | | | | | | | | | | fails." into jb-dev * commit 'abf67e1baa0a4b313d9338e69261db47c33725be': Fall back to NDEF push if handover SNEP get fails.
| * Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-253-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows applications to be able to set both a Uri (for handover) and an NDEF message, which will only be sent if the handover request does not work (as will be the case on pre-J devices). Also, show a toast if the remote device does not support connection handover. Bug: 6561174 Change-Id: I9ffdcfdf0cded319fbb4ab646ae1da5382fcb74a
* | am 7d44aa52: am befa3d6d: Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
|\ \ | |/ | | | | | | * commit '7d44aa52f36e8b0a08fcbb7fdf3af207cd54a97b': Show time in NFC handover notifications.
| * Show time in NFC handover notifications.Martijn Coenen2012-05-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | Notification sorting is coupled to the time associated with the notifications, and there's no way to hide the time in the notification without setting the time to zero. Since we prefer a proper sorting over hiding the time, just show the time again. Change-Id: I3188a80f8d7b7fcac54ffa790df58faa53241557
* | am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-211-2/+15
|\ \ | |/ | | | | | | * commit 'beb7b1b4b95b1762b507eb2a9c6380e24c8b7a62': Bluetooth Beam: generate unique filenames.
| * Bluetooth Beam: generate unique filenames.Martijn Coenen2012-05-181-2/+15
| | | | | | | | | | | | | | | | | | | | | | When moving files to beam/, make sure the destination file is unique. Also, give the transfer a little more time to be initiated; OPP can take quite some time to startup, especially with debug logging. Change-Id: I304c297587e3ad2f339438201bb0b53152084af4
* | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-211-1/+5
|\ \ | |/ | | | | | | * commit '91ebf1e2e815034504265f1f7472780bcbd30123': Don't use NPP for connection handover.
| * Don't use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
| | | | | | | | | | | | | | Handover will only work with SNEP; if SNEP fails, don't try with NPP. Change-Id: Ib92c90cb588b99e177fa1c70b89753ef8d0e16ea
* | am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." ↵Martijn Coenen2012-05-211-1/+9
|\ \ | |/ | | | | | | | | | | into jb-dev * commit 'e769540a26900bb809c210c976eaca3ac6cf2605': Close NFCEE when NFC is being shut down.
| * Merge "Close NFCEE when NFC is being shut down." into jb-devMartijn Coenen2012-05-171-1/+9
| |\
| | * Close NFCEE when NFC is being shut down.Martijn Coenen2012-05-171-1/+9
| | | | | | | | | | | | | | | Bug: 6501921 Change-Id: Ib76fd3a436632ddad0da7c73f7972018990f37c0
* | | am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam ↵Martijn Coenen2012-05-212-30/+109
|\ \ \ | |/ / | | | | | | | | | | | | | | | transfers." into jb-dev * commit '0b61093016daae3df331e1a6780757254c06859a': Allow cancelling of Bluetooth Beam transfers.
| * | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-172-30/+109
| |\ \ | | |/
| | * Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-162-30/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an action to the notification entry that allows cancelling Beam transfers. Also, each transfer now has a generic timer that marks the transfer as failed, in case no updates happen on the transfer at all for 10 seconds. Change-Id: I9670e4e782e5c1b846a07f7e490a2f317a45fb70
* | | am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-211-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'c9f617a9c99f579e753a09387629f3ddac8e9ca7': Eliminate obsolete flag.
| * | Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-171-1/+0
| |\ \ | | |/ | |/|
| | * Eliminate obsolete flag.Craig Mautner2012-05-171-1/+0
| | | | | | | | | | | | | | | | | | The FLAG_KEEP_SURFACE_WHILE_ANIMATING has been removed. Change-Id: Ia9623fb1fd5a124145bbb827acfb77767b05f636
* | | am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with ↵Martijn Coenen2012-05-172-65/+286
|\ \ \ | |/ / | | | | | | | | | | | | | | | multi-file transfers." into jb-dev * commit '8baa9162ad3593b248fb6801b8feb30ad581467b': Bluetooth Beam handover: deal with multi-file transfers.
| * | Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-152-65/+286
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A handover transfer object no longer represents a single file, but all the files associated with the handover. This association is based on the source address of the transfer and a timer; if a new file transfer from the same source is started within this timer, it is considered to be part of the same handover transfer. Received files are stored in beam/. If multiple files are transferred, they are stored in their own subdirectory of beam. We now use the mediaScanner for mime-types that the platform can deal with by default. The advantage of this is that the mediaScanner can already gather meta-data for these files, and (platform) apps can query for and populate views with such data. 3rd party applications can also query the mediaScanner for meta-data on the received files. A handover transfer object has a single notification associated with it; upon launching the notification, a single ACTION_VIEW intent is launched. If multiple files were transferred as part of this handover, ACTION_VIEW is launched on the first file in the set. Change-Id: I00c23e58736f6dbe96726a1ec56fbc8c984a215d
* | resolved conflicts for merge of c989f25d to masterJustin Koh2012-05-171-20/+33
|\ \ | |/ |/| | | Change-Id: I6d9df6e420cb4047f06848d4c0d94d30a6cc575a
| * Don't instantiate sendUi in Nfc if we are in appliance mode.Justin Koh2012-05-171-20/+33
| | | | | | | | | | | | | | | | | | | | | | Don't initiate sendUi in Nfc if we are in appliance mode. This saves 20MB of memory. Bug: 6470917 TESTED = runs on Tungsten. Change-Id: I41df65a67cd0f3af3e73469c1679d707c98cc3f8
| * Use the new "appliance" ui mode configuration to determine whether to show ↵Joe Onorato2011-12-141-1/+10
| | | | | | | | | | | | nfc confirmation ui. Change-Id: Iebad3ee6a40341b963ecf118f8d46f08b6478a25
* | UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-102-5/+80
| | | | | | | | | | | | | | | | 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-105-113/+293
| | | | | | | | | | | | | | | | | | | | - 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-243-39/+388
|\ \
| * | Latest changes for Bluetooth Beam.Martijn Coenen2012-04-203-39/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Added shared prefs for SE wired modeSunil Jogi2012-04-203-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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
* | 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-052-3/+11
| | | | | | | | 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
* | | 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 "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
generated by cgit v1.1 at 2024-12-24 20:24:02 +0000