summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Remove unused functions; correct spellingEvan Chu2012-08-161-79/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused functions; correct spelling Change-Id: I6ecf17f8cf8eeae831ba3fcc0a2eb492332c0cb6
| * | | | | | | | | am 55dbe428: Remove gJniVersion; add thread-synchronizationEvan Chu2012-08-166-61/+51
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55dbe428a7134ec82c5356f4f8e5fd7778374509': Remove gJniVersion; add thread-synchronization
| | * | | | | | | | Remove gJniVersion; add thread-synchronizationEvan Chu2012-08-166-61/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gJniVersion. Add thread-synchronization for obtaining a new JNI handle. Change-Id: I23e05c95fd90005f6ef1cac69e1e07f0b9612227
| * | | | | | | | | am 5e100450: Don\'t call applyRouting on disable().Martijn Coenen2012-08-161-1/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | * commit '5e100450dac446c851690af1a522446fa406e4ad': Don't call applyRouting on disable().
| | * | | | | | | 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
| * | | | | | | | am 7de0211f: Reduce compilation warnings in NFC JNI.Evan Chu2012-08-152-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | * commit '7de0211f2c47500f921634d9af18900826000616': Reduce compilation warnings in NFC JNI.
| | * | | | | | Reduce compilation warnings in NFC JNI.Evan Chu2012-08-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba0dab66be054ca1b0bc0f477c1107909df65cda
| * | | | | | | am 5c7b8d9b: Remove whitespace from NFC NCI JNI.Evan Chu2012-08-1330-772/+746
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | * commit '5c7b8d9beeb46cba30bffaf94945ef6fc55e8a76': Remove whitespace from NFC NCI JNI.
| | * | | | | Remove whitespace from NFC NCI JNI.Evan Chu2012-08-1030-772/+746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Logging changes - Upgrade to stack NFA_MI_1.03.33 Change-Id: Iba2af1af49a261de50f79572b478838e2bdc890f
| * | | | | | am c6cdbf21: NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c6cdbf21958178025010c6bed797ff193c89884f': NfcService: hold a wake lock around transceive().
| | * | | | | NfcService: hold a wake lock around transceive().mike wakerly2012-08-091-22/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6629750 Change-Id: Idee36983952b4ba593464f72188c6fb702c59f7f
| * | | | | | am 341fbf46: Support for setting p2p target/initiator modes in NCI.Martijn Coenen2012-08-093-0/+44
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | * commit '341fbf46e459073c929cb20fcb231ad981b0c67d': Support for setting p2p target/initiator modes in NCI.
| | * | | | Support for setting p2p target/initiator modes in NCI.Martijn Coenen2012-08-093-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows selectively enabling / disabling p2p modes in the NCI stack. TODO: - Support selecting individual Nfc-F speeds (212/424). - Support disabling initiator Nfc-A / Nfc-F just for NFC-DEP. Change-Id: I55a08bd83640b45e2d8346587031f49213a0860b
| * | | | | am 3c47e69e: Fix one last user of astl to use stlport instead...Elliott Hughes2012-08-081-2/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3c47e69e330d6d2890afae3b0b447954fbb97911': Fix one last user of astl to use stlport instead...
| | * | | | Fix one last user of astl to use stlport instead...Elliott Hughes2012-08-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This wasn't directly referencing libastl, so I didn't find it first time round. A top level rebuild without external/astl caught it. I've since grepped and there are no other projects that pull in the include files without the shared library. Change-Id: I2dd06727098744076a7e115d05a8139029ff977a
| * | | | | am 8d6ea79d: Allow different default MIU / window sizes.Martijn Coenen2012-08-087-14/+95
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8d6ea79dad7c25f592722faf47709e1b918d4c21': Allow different default MIU / window sizes.
| | * | | | Allow different default MIU / window sizes.Martijn Coenen2012-08-077-14/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new NCI stack can deal with larger MIU and rw sizes, which give us better p2p throughput. Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5
| * | | | | am 2d57efb7: (-s ours) am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release ↵The Android Open Source Project2012-08-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '2d57efb70a92553623370786bfede151603d3305':
| | * | | | am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit '0e8be1f823d4a3f5c41c7104ac82142b3644546d':
| | | * \ \ \ Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | Change-Id: I7518866977fae2451bbabd4d213f0a184df56b26
| | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | | |\ \ \
| * | | | \ \ \ am bb3c38ae: am 295c9c25: am 484d6a32: am bb65a8d8: Allow NfcB connects in ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NCI stack. * commit 'bb3c38aec1fef674ce2ec462e7ce463963985800':
| | * | | | | | am 295c9c25: am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '295c9c2521807b09882c04069343c0ad37ec42ca': Allow NfcB connects in NCI stack.
| | | * | | | | am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | * commit '484d6a32e4d35e3e2e408010e12a51dfe0224632': Allow NfcB connects in NCI stack.
| * | | | | | | am 74dd4257: (-s ours) am 776b2480: (-s ours) am 91e82624: am 618ed5a4: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Dump NFC controller firmware version in the logs. (DO NOT MERGE) * commit '74dd42571d343416a509c4bdd16f0b8425e2c367':
| | * | | | | | am 776b2480: (-s ours) am 91e82624: am 618ed5a4: (-s ours) Dump NFC ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller firmware version in the logs. (DO NOT MERGE) * commit '776b24809659122f681b4b6e4e959579817d02c6': Dump NFC controller firmware version in the logs. (DO NOT MERGE)
| | | * | | | | am 91e82624: am 618ed5a4: (-s ours) Dump NFC controller firmware version in ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the logs. (DO NOT MERGE) * commit '91e826241003a5ac72f911b6c0bbc10075c39d84': Dump NFC controller firmware version in the logs. (DO NOT MERGE)
| * | | \ \ \ \ \ am c99a5558: (-s ours) am 23e90e31: (-s ours) am 80bdaebc: am 80cd2d68: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Fix race conditions in NdefPushServer. (DO NOT MERGE) * commit 'c99a55587cc44371a2d760685f70d7c498cd5eb1':
| | * | | | | | | am 23e90e31: (-s ours) am 80bdaebc: am 80cd2d68: (-s ours) Fix race ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions in NdefPushServer. (DO NOT MERGE) * commit '23e90e31c86095c9f839d91d59a6279d49be3f3a': Fix race conditions in NdefPushServer. (DO NOT MERGE)
| | | * | | | | | am 80bdaebc: am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) * commit '80bdaebc1dd1ce5848ce967cd0f1d3fae2c541e8': Fix race conditions in NdefPushServer. (DO NOT MERGE)
| * | | \ \ \ \ \ \ am 3198163e: (-s ours) am 9c732f87: (-s ours) am e1979663: am 11d1aed9: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Don\'t route PPSE AIDs to the host by default. (DO NOT MERGE) * commit '3198163e642352af32fd2f5ffd6faf6b3368a0d1':
| | * | | | | | | | am 9c732f87: (-s ours) am e1979663: am 11d1aed9: (-s ours) Don\'t route PPSE ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AIDs to the host by default. (DO NOT MERGE) * commit '9c732f87b56431bb89c8442c47374e721f35dc67': Don't route PPSE AIDs to the host by default. (DO NOT MERGE)
| | | * | | | | | | am e1979663: am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default. (DO NOT MERGE) * commit 'e197966328c7d030673a2da0185e9b1dfb88b718': Don't route PPSE AIDs to the host by default. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ am b483d812: (-s ours) am d21bd643: (-s ours) am 80688ad9: am a0069c82: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Follow-up NFC code drop. (DO NOT MERGE) * commit 'b483d812b3fbad88309d65a247d5da4bf7044a29':
| | * | | | | | | | | am d21bd643: (-s ours) am 80688ad9: am a0069c82: (-s ours) Follow-up NFC ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code drop. (DO NOT MERGE) * commit 'd21bd643bbeee5d4bb587a14b473fc1914546625': Follow-up NFC code drop. (DO NOT MERGE)
| | | * | | | | | | | am 80688ad9: am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80688ad96a546f36fa17f9753aa57834e5348b0e': Follow-up NFC code drop. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ \ am 12a00301: (-s ours) am f1578d8a: (-s ours) am 97273d23: am a3f98c28: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE) * commit '12a00301932c7efb29cb56bfbed80bc0a5352b4a':
| | * | | | | | | | | | am f1578d8a: (-s ours) am 97273d23: am a3f98c28: (-s ours) NFC: Initial NCI ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceHost and JNI implementation. (DO NOT MERGE) * commit 'f1578d8a641cb85dc31bd6782fa116c02347a182': NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)
| | | * | | | | | | | | am 97273d23: am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation. (DO NOT MERGE) * commit '97273d2333f61af7e0d80cca473dc02e3eee09a2': NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ \ \ am a26efd60: (-s ours) am e0b3efa6: (-s ours) am 9b5c9319: am 96c08a7d: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Point jni class references to new dhimpl package. (DO NOT MERGE) * commit 'a26efd60c46700b34f1ac9270e564e5eb5356274':
| | * | | | | | | | | | | am e0b3efa6: (-s ours) am 9b5c9319: am 96c08a7d: (-s ours) Point jni class ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | references to new dhimpl package. (DO NOT MERGE) * commit 'e0b3efa6998b667af07bdf272e402e2fd97a7f10': Point jni class references to new dhimpl package. (DO NOT MERGE)
| | | * | | | | | | | | | am 9b5c9319: am 96c08a7d: (-s ours) Point jni class references to new dhimpl ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package. (DO NOT MERGE) * commit '9b5c93193f7bd23835b24bed311ce6ec8b7ccaae': Point jni class references to new dhimpl package. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ \ \ \ am 5df7edd2: (-s ours) am 58595557: (-s ours) am 56ba805c: am 25b0c5d2: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Fix type of collision resolution record. (DO NOT MERGE) * commit '5df7edd2c6f95134323fa5331ee44a391887ca53':
| | * | | | | | | | | | | | am 58595557: (-s ours) am 56ba805c: am 25b0c5d2: (-s ours) Fix type of ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision resolution record. (DO NOT MERGE) * commit '5859555794ed4e2f741d574c8ac3dfc98d194669': Fix type of collision resolution record. (DO NOT MERGE)
| | | * | | | | | | | | | | am 56ba805c: am 25b0c5d2: (-s ours) Fix type of collision resolution record. ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) * commit '56ba805cac20b1040b4a08bc6114ffb7e1a6bad0': Fix type of collision resolution record. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ \ \ \ \ am b24b16f3: (-s ours) am 09975a6b: (-s ours) am 333bcb2e: am 721d0196: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Implement connection handover LLCP service. (DO NOT MERGE) * commit 'b24b16f3052dcdfba07a67b88bea0c2395eb6e61':
| | * | | | | | | | | | | | | am 09975a6b: (-s ours) am 333bcb2e: am 721d0196: (-s ours) Implement ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection handover LLCP service. (DO NOT MERGE) * commit '09975a6b0907057a9e022c6287bb946f7ca089a4': Implement connection handover LLCP service. (DO NOT MERGE)
| | | * | | | | | | | | | | | am 333bcb2e: am 721d0196: (-s ours) Implement connection handover LLCP ↵Martijn Coenen2012-08-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service. (DO NOT MERGE) * commit '333bcb2e86e77c9fae37bbb17e86433c6866abb4': Implement connection handover LLCP service. (DO NOT MERGE)
| * | | \ \ \ \ \ \ \ \ \ \ \ \ am ccd5b2f4: (-s ours) am 9f61df8f: (-s ours) am 39d331be: am 4b33b45e: (-s ↵Martijn Coenen2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE) * commit 'ccd5b2f4d496d2358ddc76cf32f1cfe9baa59c6f':
| | * | | | | | | | | | | | | | am 9f61df8f: (-s ours) am 39d331be: am 4b33b45e: (-s ours) Move NXP JNI and ↵Martijn Coenen2012-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceHost implementation into separate dir. (DO NOT MERGE) * commit '9f61df8fe808c90535d401efc94055f78d1c3849': Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)
generated by cgit v1.1 at 2025-08-18 01:14:49 +0000