Commit graph

59587 commits

Author SHA1 Message Date
Hongguang Chen
13c04c29cc Merge "Allow non-zero HCI interface numbers" into main 2023-12-07 23:29:23 +00:00
Chienyuan Huang
a9a2717670 Add default implementation for Channel Sounding
Bug: 312865139
Test: m android.hardware.bluetooth.ranging-service.default

Change-Id: I4324693ba6b7d0b6eef171e72acc5e7c30a2f35b
2023-12-07 22:06:26 +00:00
Chienyuan Huang
d74aedc9df Add HAL interface for Channel Sounding
Bug: 310941161
Test: m android.hardware.bluetooth.ranging-update-api
Change-Id: I4b0d103b851c546c9cb7277ae0c828d740367b63
2023-12-07 22:03:25 +00:00
Seth Moore
4bf69eac00 Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a1d am: 2edabacc98
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861829

Change-Id: I9357dead640018924e9bff10ea04a9e3e6b3e476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 21:16:40 +00:00
Seth Moore
2edabacc98 Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a1d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861829

Change-Id: I7c0d85c0ff1ae7f834cf8baca7147aa494ad46d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 20:36:16 +00:00
Seth Moore
c9674f6535 Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a1d am: c3e1e032a9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861829

Change-Id: Iacb293a784c4050842af26091749d9742aac926e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 20:24:56 +00:00
Seth Moore
c3e1e032a9 Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a1d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861829

Change-Id: I5476c9469ca4378969a5e2acd88785425baf6859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 19:52:59 +00:00
Seth Moore
40f1230a1d Merge "Change the way rkp tool obtains serial number" into main 2023-12-07 19:14:37 +00:00
Alice Kuo
3f9deaad66 Merge changes from topic "HFP-SCO-management" into main am: f3531c57ea am: 7ee4289ef1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824291

Change-Id: I3c77451112914ff9856b39bebd54ac00ae1029eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:30:55 +00:00
Yuyang Huang
3cc3a89559 Add HFP to BluetoothAudioSession am: aa70c11126 am: 5f3c47778e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806338

Change-Id: I656c7595fec4ce5b6781c64a75c1e676cc29d2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:30:49 +00:00
Yuyang Huang
289194c33a Add HFP default implementation am: 91d7f8b916 am: 0ec3b5a607
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806339

Change-Id: I21ced679b1fb96666ca10fe9bdf199ed7754ed3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:30:45 +00:00
Yuyang Huang
f410a9397b Add HFP AIDL design am: e50be86fd4 am: fbf5d5c9d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2774933

Change-Id: I835b6fa60c246fd375b4d63b181aa768e762ac62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:30:40 +00:00
Alice Kuo
7691035f93 Merge changes from topic "HFP-SCO-management" into main am: f3531c57ea am: a11fd2b39e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824291

Change-Id: I5a24e0dfb40ef54ac1c6065972d522986c059500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:16:54 +00:00
Yuyang Huang
d001c451ab Add HFP to BluetoothAudioSession am: aa70c11126 am: 0bcade6107
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806338

Change-Id: Ic228aeb47d5597b5d9c0819f45609e0dd9f35e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:16:51 +00:00
Yuyang Huang
2bad42081b Add HFP default implementation am: 91d7f8b916 am: 7331e690fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806339

Change-Id: I593e13f53211046914080ebf154fc18f6e1bdd19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:16:47 +00:00
Yuyang Huang
4716916bcb Add HFP AIDL design am: e50be86fd4 am: 2d5b69bab5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2774933

Change-Id: I928e9685ba15b492401bed639bfd3aea00abd024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:16:43 +00:00
Alice Kuo
a11fd2b39e Merge changes from topic "HFP-SCO-management" into main am: f3531c57ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824291

Change-Id: I2369903c947b6fbb87effb5e70b8d48e0263eefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:08:34 +00:00
Yuyang Huang
0bcade6107 Add HFP to BluetoothAudioSession am: aa70c11126
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806338

Change-Id: I9748302968150c39c77c3c3b0095733e6a00d7ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:08:31 +00:00
Yuyang Huang
7331e690fb Add HFP default implementation am: 91d7f8b916
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806339

Change-Id: Ibede4ebb80e6f8cd1abeb9630151743b58a93e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:08:27 +00:00
Yuyang Huang
2d5b69bab5 Add HFP AIDL design am: e50be86fd4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2774933

Change-Id: I77bd9347d6b226b5320a021e239d2f63d7232a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:08:23 +00:00
Alice Kuo
7ee4289ef1 Merge changes from topic "HFP-SCO-management" into main am: f3531c57ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824291

Change-Id: Ibb2bb4bf5bc6c3bd2e0383a09b9b9ab86555bc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:58:01 +00:00
Yuyang Huang
5f3c47778e Add HFP to BluetoothAudioSession am: aa70c11126
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806338

Change-Id: I4b2d6b9eb954dfb433de5762275ce800d972d9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:57:57 +00:00
Yuyang Huang
0ec3b5a607 Add HFP default implementation am: 91d7f8b916
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2806339

Change-Id: I011c70461c36c910e0fc22ce61946259f0a16b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:57:53 +00:00
Yuyang Huang
fbf5d5c9d7 Add HFP AIDL design am: e50be86fd4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2774933

Change-Id: I49d95135d541aaae443ab57ff9271c1752e72557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:57:49 +00:00
Antoine SOULIER
4e34d05b7b Codec Extensibility A2DP HAL Reference Implementation
Test: m
Bug: 297037759
Change-Id: I84b32c2ef22da8c3e920e497501b9f16feaf803c
2023-12-07 16:51:57 +00:00
Antoine SOULIER
33c4e5a629 Codec Extensibility A2DP Specific AIDL
Test: m
Bug: 297037759
Change-Id: If9a73d2791781ad948ce76b55b9d29f7eba655e4
2023-12-07 16:51:01 +00:00
Alice Kuo
f3531c57ea Merge changes from topic "HFP-SCO-management" into main
* changes:
  Add VTS for HFP sessions
  Add HFP to BluetoothAudioSession
  Add HFP default implementation
  Add HFP AIDL design
2023-12-07 16:20:16 +00:00
chuanchuan.gao
18a9fa99a8 Change the way rkp tool obtains serial number
[Description]
1.Add patch to modify rkp_factory_extraction_tool, so
 that it can meet TV customer's factory product line.
2.Change the method for
rkp_factory_extraction_tool to get the serial number.
3.Introduce a new input parameter, serialno_prop,
to the function jsonEncodeCsrWithBuild.
4.Use the new property of serialno_prop if it is set,
otherwise defaults to "ro.serialno".

Test:
1.build pass
2.AC on/off pass
3.run "rkp_factory_extraction_tool
--output_format build+csr
--serialno_prop $(customer_prop) > csr.json" pass
4.run "rkp_factory_extraction_tool
--output_format build+csr > csr.json" pass
5.VtsHalRemotelyProvisionedComponentTargetTest pass
6.libkeymint_remote_prov_support_test pass
7.VtsAidlKeyMintTargetTest pass

Bug: 313811996
Change-Id: I8aa83bacab22f0a28bc54aea9e816f75a382ffde
2023-12-07 18:23:15 +08:00
David Drysdale
84fcae84c7 Merge "Secretkeeper: add AuthGraph key exchange" into main am: 986e92e098 am: 0779b28633
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824792

Change-Id: I186bd5c258d55132408608f25c2f2274c798e6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 08:38:58 +00:00
David Drysdale
0779b28633 Merge "Secretkeeper: add AuthGraph key exchange" into main am: 986e92e098
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824792

Change-Id: Ibad339204df58b4001dd3922fe03780f70ec2466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 08:13:33 +00:00
David Drysdale
045dad28bb Merge "Secretkeeper: add AuthGraph key exchange" into main am: 986e92e098 am: c074a562e3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824792

Change-Id: I3e0df63c27bb2cac1066811bdaca28932a58d276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 08:02:41 +00:00
David Drysdale
c074a562e3 Merge "Secretkeeper: add AuthGraph key exchange" into main am: 986e92e098
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824792

Change-Id: I5f6c0773a48b1ce9f911bc689fc32360049f2e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 07:31:27 +00:00
David Drysdale
986e92e098 Merge "Secretkeeper: add AuthGraph key exchange" into main 2023-12-07 06:56:12 +00:00
Bao Do
7239943cb5 Add VTS for HFP sessions
Contains VTS tests for HFP software encoding / decoding
and HFP hardware sessions.

Bug: 265057196
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I4bbdc07a0afa0a889a8cf34019c6685ebd4fa0a0
2023-12-07 05:57:26 +00:00
Yuyang Huang
aa70c11126 Add HFP to BluetoothAudioSession
Test: m .
Bug: 265057196
Change-Id: I0e2e9d0f34ebf3f732c4f2da799c4c30f52bdeef
2023-12-07 05:54:59 +00:00
Yuyang Huang
91d7f8b916 Add HFP default implementation
Bug: 265057196
Test: m android.hardware.bluetooth.audio-update-api
Change-Id: I712eb4db0d776b465436ae54730ad883ecaf40a0
2023-12-07 05:54:59 +00:00
Yuyang Huang
e50be86fd4 Add HFP AIDL design
Bug: 265057196
Test: m android.hardware.bluetooth.audio-update-api
Change-Id: I066c8c0db7516da8709c32558fe3b21ddbd91054
2023-12-07 05:54:58 +00:00
Tom Huang
858b6457a0 Merge "Bluetooth Finder: fix typo android.hardware.bluetooth.finder-service.default" into main am: 2a824c99f5 am: 9a9f9eb4fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861289

Change-Id: Ie4e2c65cb210154c7d062903283436066854ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 05:50:34 +00:00
Tom Huang
83fc4221fb Merge "Bluetooth Finder: fix typo android.hardware.bluetooth.finder-service.default" into main am: 2a824c99f5 am: ede641c165
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861289

Change-Id: Ie3bb1aeb4fc6c0ed7ab8a503fe40ea236befbf9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 05:19:42 +00:00
Tom Huang
9a9f9eb4fd Merge "Bluetooth Finder: fix typo android.hardware.bluetooth.finder-service.default" into main am: 2a824c99f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861289

Change-Id: Ic32582ff85bbd69e493581db6fc037cadc4dded4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 05:16:45 +00:00
Tom Huang
ede641c165 Merge "Bluetooth Finder: fix typo android.hardware.bluetooth.finder-service.default" into main am: 2a824c99f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861289

Change-Id: Idfc14da0f2e3e36028147e341205e9c63a8b6bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 04:47:00 +00:00
Tom Huang
2a824c99f5 Merge "Bluetooth Finder: fix typo android.hardware.bluetooth.finder-service.default" into main 2023-12-07 04:15:37 +00:00
Nagendra Prasad Nagarle Basavaraju
66f34a3952 [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: 2f5ba62a79 -s ours am: 1aaff76189 -s ours am: 9ff54dc876 -s ours am: cd726432df -s ours am: 4f5122cee8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: Ice3b97a01a67765e45a3d694a675845e2e702f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:34:30 +00:00
Nagendra Prasad Nagarle Basavaraju
067d576e49 [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: b260dfa804 -s ours am: 8de9bbb832 -s ours am: 429c26dcd5 -s ours am: ebd120641f -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I02cbe7c7a53992c2fa0fe4978e114c7b4913e94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:34:20 +00:00
yanggang.yang
c59d2d80ee Allow non-zero HCI interface numbers
[Description]
when driver re-register hci device, it may register hci 1
[Root Cause]
In the kernel mechanism, there may be a timing issue. when driver re-register hci device,kernel may not completely unregister hci 0.But aidl only open hci 0.
[Solution]
assign a value to the hci interface based on the device node found by AIDL

[Test Report]
Insert the bt chip into the usb 2.0 port, and then suspend the TV. The bt chip will be disconnected due to the USB power outage. And then quickly resume the TV,check whether the Bluetooth state is on. Suspend and resume for several times, check for bt state.

Change-Id: I57fd4a22c956e0cf2b4a516247c258493163e51a
BUG: 314149416
2023-12-07 02:07:58 +00:00
Nagendra Prasad Nagarle Basavaraju
97055a709c [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: 2f5ba62a79 -s ours am: 1aaff76189 -s ours am: 9ff54dc876 -s ours am: 19ea8bb8a3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I73bf898ed3eedd9c95c3a4ab5b98159d2901ecb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:01:58 +00:00
Nagendra Prasad Nagarle Basavaraju
4f5122cee8 [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: 2f5ba62a79 -s ours am: 1aaff76189 -s ours am: 9ff54dc876 -s ours am: cd726432df -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: Ia909c2077a2f58c4669316dc7fb7f49654bae9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:01:54 +00:00
Nagendra Prasad Nagarle Basavaraju
7385b264d0 [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: b260dfa804 -s ours am: 8de9bbb832 -s ours am: ca1cec4be9 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I6110e7baa9f76507cfb2c26c213c0a58f12452d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:01:49 +00:00
Nagendra Prasad Nagarle Basavaraju
ebd120641f [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: b260dfa804 -s ours am: 8de9bbb832 -s ours am: 429c26dcd5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I8b99430f7fdd0aa70ab85351ba18beb8457b4804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 02:01:45 +00:00
Nagendra Prasad Nagarle Basavaraju
19ea8bb8a3 [automerger skipped] [DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response am: 378bd90e66 am: f88933b02e -s ours am: 2f5ba62a79 -s ours am: 1aaff76189 -s ours am: 9ff54dc876 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858865

Change-Id: I28c87b2da7b55f661527539640a07b49157c208f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 01:44:43 +00:00