summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * am 0f2b555f: Don\'t use NPP for connection handover.Martijn Coenen2012-05-181-1/+5
| |\ | | | | | | | | | | | | * commit '0f2b555fe51f3d8a828cf61d269b8be6eecbf68b': 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.
| * | am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-devMartijn Coenen2012-05-171-1/+9
| |\ \ | | |/ | | | | | | | | | * commit '1179ee22543abdd350f0a60b887e2fb7cf95d6a6': 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-215-30/+111
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | transfers." into jb-dev * commit '0b61093016daae3df331e1a6780757254c06859a': Allow cancelling of Bluetooth Beam transfers.
| * | | am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-175-30/+111
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2aa9b461d148f49ab9c63858f1c8f87c0b40b824': Allow cancelling of Bluetooth Beam transfers.
| | * | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-175-30/+111
| | |\ \ | | | |/
| | | * Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-165-30/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | am b0f96e9d: Merge "Eliminate obsolete flag." into jb-devCraig Mautner2012-05-171-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b0f96e9d93e2c96caa95186164f655009a8e8f60': 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-174-66/+288
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | multi-file transfers." into jb-dev * commit '8baa9162ad3593b248fb6801b8feb30ad581467b': Bluetooth Beam handover: deal with multi-file transfers.
| * | | | am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file ↵Martijn Coenen2012-05-164-66/+288
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | transfers." into jb-dev * commit '05d74c949fb8d0ed743cb356f2e5999708b2566f': Bluetooth Beam handover: deal with multi-file transfers.
| | * | | Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-devMartijn Coenen2012-05-164-66/+288
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-154-66/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 2e0f3b1a: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '2e0f3b1a403f7f8225fec30180f07a5e59a285d7': Bluetooth Beam bug fixes, UX and i18n. Call right Bluetooth enable API. Force bluetooth OPP to handle ACTION_SEND.
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I570f019a1cc39da935520093e6ca8cc8471b956f
| | | * \ \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | | |\ \ \
| | * | | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-116-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-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff926bce1d3b00fe301195b6e3d341631c58fe29
| | | | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * | Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9520b53d699a79d9a7c09cdb3eb27c4e001d7fd
| | | | | | | | | | | * | merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-280-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-160-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-140-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
generated by cgit v1.1 at 2024-12-24 18:40:01 +0000