summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.Martijn Coenen2012-09-041-1/+2
| | | | | Bug: 6925612 Change-Id: I37f49a150c4fc1763b2121e46fedf79d662b0a2b
* Don't call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
| | | | | | Original patch from Chih-Weih Huang <cw_huang@htc.com>. Change-Id: I15b129d318d125cf67aba83d16441c6d52bb193a
* NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
| | | | | Bug: 6629750 Change-Id: Idee36983952b4ba593464f72188c6fb702c59f7f
* Allow different default MIU / window sizes.Martijn Coenen2012-08-075-11/+61
| | | | | | | The new NCI stack can deal with larger MIU and rw sizes, which give us better p2p throughput. Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5
* am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-071-4/+0
|\ | | | | | | | | * commit 'bb65a8d87ee523c92ca1b5f57efe139bab3859fe': Allow NfcB connects in NCI stack.
| * Allow NfcB connects in NCI stack.Martijn Coenen2012-08-071-4/+0
| | | | | | | | | | | | | | PN544 did not support this - move the code checking for that into dh implementation. Change-Id: I4def57697bc81cf599421f1ffbfa85c0db72c458
| * Fix race conditions in NdefPushServer. (DO NOT MERGE)Martijn Coenen2012-08-021-19/+48
| | | | | | | | | | | | | | | | Exposed by the new stack; need to take locks around mRunning and mLlcpServerSocket. Bug: 6922853 Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f
| * NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)Martijn Coenen2012-08-012-17/+11
| | | | | | | | | | | | | | | | | | | | From partner drop at 07/20. Modified to fit into our new JNI/DH split. New build config that builds two targets, Nfc and NfcNci, each with their own dependencies. Product config files have to specify either Nfc or NfcNci in their packages config. Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce
| * Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-011-1/+3
| | | | | | | | | | Bug: 6759842 Change-Id: I6d1e24472702007616c0be71aacda9e591a23620
| * Implement connection handover LLCP service. (DO NOT MERGE)Martijn Coenen2012-08-016-7/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Connection Handover specification dictates that we should exchange Hr/Hs records over a dedicated LLCP service. This adds the service, and starts using it by default. It will fall back to the SNEP GET method to remain compatible with Android 4.1 devices. SNEP GET on these devices will return "Not Implemented", also per the SNEP spec. Also fixed a bug in endianness of the OOB record. Bug: 6759842 Change-Id: Ifd360f556bf0e1757eb8bbaadf11efa094aefcf6
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-018-1552/+2
| | | | | | | | | | | | | | | | | | | | Preparation for the new NCI stack. The idea is to build either the NXP or the NCI stack, triggered by a makefile switch. To that end, move the DeviceHost and JNI implementations in their own directory, so we can build them only if needed. Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d
| * Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO ↵Martijn Coenen2012-08-018-2/+1552
| | | | | | | | | | | | | | | | NOT MERGE) This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1. Change-Id: I7ed3a1ba24bbbdb3336547c20f47c344d70b2d30
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-018-1552/+2
| | | | | | | | | | | | | | | | | | | | Preparation for the new NCI stack. The idea is to build either the NXP or the NCI stack, triggered by a makefile switch. To that end, move the DeviceHost and JNI implementations in their own directory, so we can build them only if needed. Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933
* | Fix race conditions in NdefPushServer.Martijn Coenen2012-08-031-19/+48
| | | | | | | | | | | | | | | | Exposed by the new stack; need to take locks around mRunning and mLlcpServerSocket. Bug: 6922853 Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f
* | NFC: Initial NCI DeviceHost and JNI implementation.Martijn Coenen2012-07-272-17/+11
| | | | | | | | | | | | | | | | | | | | From partner drop at 07/20. Modified to fit into our new JNI/DH split. New build config that builds two targets, Nfc and NfcNci, each with their own dependencies. Product config files have to specify either Nfc or NfcNci in their packages config. Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce
* | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-258-1552/+2
| | | | | | | | | | | | | | | | | | | | Preparation for the new NCI stack. The idea is to build either the NXP or the NCI stack, triggered by a makefile switch. To that end, move the DeviceHost and JNI implementations in their own directory, so we can build them only if needed. Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d
* | Revert "Move NXP JNI and DeviceHost implementation into separate dir."Martijn Coenen2012-07-248-2/+1552
| | | | | | | | This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
* | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-248-1552/+2
| | | | | | | | | | | | | | | | | | | | Preparation for the new NCI stack. The idea is to build either the NXP or the NCI stack, triggered by a makefile switch. To that end, move the DeviceHost and JNI implementations in their own directory, so we can build them only if needed. Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933
* | Fix type of collision resolution record.Martijn Coenen2012-07-231-1/+3
| | | | | | | | | | Bug: 6759842 Change-Id: I0fe1e6859d8792b959a1306404bd239ab33dd3b4
* | Implement connection handover LLCP service.Martijn Coenen2012-07-166-7/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Connection Handover specification dictates that we should exchange Hr/Hs records over a dedicated LLCP service. This adds the service, and starts using it by default. It will fall back to the SNEP GET method to remain compatible with Android 4.1 devices. SNEP GET on these devices will return "Not Implemented", also per the SNEP spec. Also fixed a bug in endianness of the OOB record. Bug: 6759842 Change-Id: Iafe67ab119e933df5dfa0a5645a95bc59badd8ae
* | am fef4b82c: am 59b6bb0b: Merge "Don\'t assume Bluetooth is present." into ↵Martijn Coenen2012-06-062-6/+24
|\ \ | |/ | | | | | | | | | | jb-dev * commit 'fef4b82cb6f95a9a7dbb510e31d6316883857c26': Don't assume Bluetooth is present.
| * Don't assume Bluetooth is present.Martijn Coenen2012-06-062-6/+24
| | | | | | | | | | Bug: 6620788 Change-Id: I39f7b106885b1bb932353c47c3b0f7370c56e8c4
* | am d560e24e: am f4392711: Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
|\ \ | |/ | | | | | | * commit 'd560e24e8edf8251a3756400ce5f75bcfdd51b9a': Add watchdog to applyRouting().
| * Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | We've seen some devices hang in doSelectSecureElement, probably waiting for a response from the HW. Root cause is unknown, may be due to a different access pattern of Wallet or OTAProxy. Until we can reproduce better and find the root cause, watchdog this method. Added advantage is that we can have the relevant context in the logs when the crash occurs. Bug: 6585958 Change-Id: Ic797ea479869a68173fcd42049cc4ba8d009d2e0
* | 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
generated by cgit v1.1 at 2025-01-11 08:22:27 +0000