summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
|\ | | | | | | | | * commit 'bb65a8d87ee523c92ca1b5f57efe139bab3859fe': Allow NfcB connects in NCI stack.
| * Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
| | | | | | | | | | | | | | PN544 did not support this - move the code checking for that into dh implementation. Change-Id: I4def57697bc81cf599421f1ffbfa85c0db72c458
* | am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | NOT MERGE) * commit '618ed5a492c6474d3d5fd11d06febded71b0a7c2': Dump NFC controller firmware version in the logs. (DO NOT MERGE)
| * Dump NFC controller firmware version in the logs. (DO NOT MERGE)Martijn Coenen2012-08-061-2/+20
| | | | | | | | Change-Id: I0ff7c460b53f56d7b98e1e27838cfd4243a2b0a0
* | am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | * commit '80cd2d684ffec51b1a05f9ab1bc7eacff311ecef': Fix race conditions in NdefPushServer. (DO NOT MERGE)
| * 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
* | am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | NOT MERGE) * commit '11d1aed981ebedf675029326f2602c1b1bfaf62e': Don't route PPSE AIDs to the host by default. (DO NOT MERGE)
| * Don't route PPSE AIDs to the host by default. (DO NOT MERGE)Martijn Coenen2012-08-021-2/+0
| | | | | | | | | | | | | | | | | | | | In our current model these AIDs should be handled by the EE. Because this routing also activates Nfc-B listen mode, it causes some Beam inter-op issues with PN544-based devices. Change-Id: I865bbf7cdd48a781410ad3742426fa9b05751c70
* | am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | * commit 'a0069c828b8e09089ce38fe80c058268a44fc932': Follow-up NFC code drop. (DO NOT MERGE)
| * Follow-up NFC code drop. (DO NOT MERGE)Martijn Coenen2012-08-016-188/+92
| | | | | | | | | | | | | | From partner, uploaded 07/26/2012; modified to fit in new dhimpl/jni split. Change-Id: I3a8c04ab9427adc1295b7b46ec1308f98a2c2c5e
* | am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | (DO NOT MERGE) * commit 'a3f98c286444a9fb009cf6c6753ae67bdf51ac6b': NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)
| * NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)Martijn Coenen2012-08-0143-23/+16179
| | | | | | | | | | | | | | | | | | | | 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
* | am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | NOT MERGE) * commit '96c08a7d49a8dcd33a5acac1c7c73fe3711bd9bd': Point jni class references to new dhimpl package. (DO NOT MERGE)
| * Point jni class references to new dhimpl package. (DO NOT MERGE)Martijn Coenen2012-08-017-20/+20
| | | | | | | | | | | | | | The DeviceHost classed moved to a new package, updated the JNI references accordingly. Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5
* | am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | * commit '25b0c5d26d58d7d0af200b315a840881001b544d': Fix type of collision resolution record. (DO NOT MERGE)
| * Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-011-1/+3
| | | | | | | | | | Bug: 6759842 Change-Id: I6d1e24472702007616c0be71aacda9e591a23620
* | am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | MERGE) * commit '721d01960285314178c9026f4cbca449a5f385a6': Implement connection handover LLCP service. (DO NOT MERGE)
| * 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
* | am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | separate dir. (DO NOT MERGE) * commit '4b33b45ed7880968f9836213e2395dbd55e17b31': Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-0122-9/+20
| | | | | | | | | | | | | | | | | | | | 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
* | am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | into separate dir." (DO NOT MERGE) * commit '51a43593261ebf190f736ecbb3939b69479a21dc': Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)
| * Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO ↵Martijn Coenen2012-08-0121-17/+9
| | | | | | | | | | | | | | | | NOT MERGE) This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1. Change-Id: I7ed3a1ba24bbbdb3336547c20f47c344d70b2d30
* | am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into ↵Martijn Coenen2012-08-070-0/+0
|\ \ | |/ | | | | | | | | | | separate dir. (DO NOT MERGE) * commit 'c2b3f02b1217c761d5247c3cda9444f0418b51cb': Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-0121-9/+17
| | | | | | | | | | | | | | | | | | | | 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
* | Dump NFC controller firmware version in the logs.Martijn Coenen2012-08-061-2/+20
| | | | | | | | Change-Id: I0ff7c460b53f56d7b98e1e27838cfd4243a2b0a0
* | 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
* | Don't route PPSE AIDs to the host by default.Martijn Coenen2012-08-021-2/+0
| | | | | | | | | | | | | | | | | | | | In our current model these AIDs should be handled by the EE. Because this routing also activates Nfc-B listen mode, it causes some Beam inter-op issues with PN544-based devices. Change-Id: I865bbf7cdd48a781410ad3742426fa9b05751c70
* | Merge "Follow-up NFC code drop." into jb-mr1-devMartijn Coenen2012-07-306-188/+92
|\ \
| * | Follow-up NFC code drop.Martijn Coenen2012-07-306-188/+92
| | | | | | | | | | | | | | | | | | | | | From partner, uploaded 07/26/2012; modified to fit in new dhimpl/jni split. Change-Id: I3a8c04ab9427adc1295b7b46ec1308f98a2c2c5e
* | | Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-devMartijn Coenen2012-07-2743-23/+16179
|\ \ \ | |/ /
| * | NFC: Initial NCI DeviceHost and JNI implementation.Martijn Coenen2012-07-2743-23/+16179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 29b858a5: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ | |/ / |/| | | | | * commit '29b858a5d60a0ccd14be56ab0739b0ac45ec4656':
| * | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I9368f5edddf23587c72fc9658f0bd263ab6e75f0
| | * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| | |\ \
* | | \ \ am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-250-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '238cce657e58a243447f0a4de644502e5db5dac1': Fix type of collision resolution record.
| * \ \ \ \ am 69369b77: am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-250-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '69369b773d2ea675aa5a18582c82e2ba65dc3a42': Fix type of collision resolution record.
| | * | | | am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '43f226312d34edc17a6319f7d61a06d20e1850e7': Fix type of collision resolution record.
| | | * | | Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6759842 Change-Id: I6d1e24472702007616c0be71aacda9e591a23620
* | | | | | am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP ↵Martijn Coenen2012-07-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service. * commit '73eac104b08672181a636d23c446cf9cdd192fe5': Implement connection handover LLCP service.
| * | | | | am afa30410: am 327d0e7c: Implement connection handover LLCP service.Martijn Coenen2012-07-250-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'afa30410182f83efbd12eeca1fb12413da573543': Implement connection handover LLCP service.
| | * | | | am 327d0e7c: Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '327d0e7c5a454b704bd37bae40cf20383d00cc63': Implement connection handover LLCP service.
| | | * | | Implement connection handover LLCP service.Martijn Coenen2012-07-256-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
* | | | | Point jni class references to new dhimpl package.Martijn Coenen2012-07-257-20/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The DeviceHost classed moved to a new package, updated the JNI references accordingly. Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5
* | | | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2522-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2421-17/+9
| | | | | | | | | | | | | | | | This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
* | | | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2421-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Implement connection handover LLCP service."Martijn Coenen2012-07-206-7/+414
|\ \ \ \
| * | | | 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
* | | | | Import translations. DO NOT MERGEYing Wang2012-07-131-3/+3
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ied71d51ae286e440cf16f41488f359d6468455da Auto-generated-cl: translation import
generated by cgit v1.1 at 2025-01-12 04:53:16 +0000