Commit Graph

34206 Commits

Author SHA1 Message Date
Treehugger Robot
e2030a9129 Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365 am: 96f10677b9 am: 75f1728617
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1872877

Change-Id: Ifd0974a0a61b67979b13ae399d235bd283d075fe
2021-10-29 21:48:43 +00:00
Treehugger Robot
f112b5af06 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 4cb51afac9 am: 77000a1e72 am: ff5abf0302
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874549

Change-Id: I3e92b503a22d57b65376475f294c434a85187768
2021-10-29 21:48:32 +00:00
Treehugger Robot
75f1728617 Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365 am: 96f10677b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1872877

Change-Id: I090a3dde6ec5cb15db575602a5659b4732c2b53b
2021-10-29 21:25:58 +00:00
Treehugger Robot
ff5abf0302 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 4cb51afac9 am: 77000a1e72
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874549

Change-Id: Ic866f9b52b847d67befba3b02e7c6593e083d500
2021-10-29 21:25:49 +00:00
Treehugger Robot
96f10677b9 Merge changes from topic "bluetooth_audio_hidl2.2" am: e1dc0e5365
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1872877

Change-Id: I21df41fdd4f0ace606317f9f473592b7fb6fe71c
2021-10-29 21:07:16 +00:00
Treehugger Robot
77000a1e72 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 4cb51afac9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874549

Change-Id: I113ff29d2163d3e0caa101c35ba2d9e79d269cd1
2021-10-29 21:06:59 +00:00
Treehugger Robot
e1dc0e5365 Merge changes from topic "bluetooth_audio_hidl2.2"
* changes:
  Add bluetooth.audio@2.2 implementation
  Add hidl 2.2 for LE audio support
2021-10-29 21:00:22 +00:00
Treehugger Robot
4cb51afac9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2021-10-29 20:41:35 +00:00
Shuzhen Wang
20677089cb Camera: Adjust VTS test to relax multi-camera requirement am: 55190e272d am: 69f3f612fa am: e3f1252677
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874017

Change-Id: Ia7341e4dd566f2c8b49f156c529e5ca57c3757d1
2021-10-29 20:36:24 +00:00
Shuzhen Wang
e3f1252677 Camera: Adjust VTS test to relax multi-camera requirement am: 55190e272d am: 69f3f612fa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874017

Change-Id: Ia16a194d087eb5ecf43b0711a065db2579487808
2021-10-29 20:18:55 +00:00
Shuzhen Wang
69f3f612fa Camera: Adjust VTS test to relax multi-camera requirement am: 55190e272d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1874017

Change-Id: I97e1584e5f3758af0483c0bb4a62cef8bfd39f71
2021-10-29 20:00:39 +00:00
Shuzhen Wang
55190e272d Camera: Adjust VTS test to relax multi-camera requirement
The multi-camera Grf requirement is now only applicable to rear facing
camera.

Test: Run test on Pixel devices
Bug: 204252005
Change-Id: Idb7735eebdc104f6ee6a5946b50c11aea809eb85
2021-10-29 18:21:36 +00:00
David Drysdale
f6a0f5fb9d Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43 am: 010a23aa0d am: 460d22a4da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853960

Change-Id: I0f545941c55de167f92495ef5b9635ad2d204dc8
2021-10-29 14:42:20 +00:00
David Drysdale
460d22a4da Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43 am: 010a23aa0d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853960

Change-Id: I5e455def037ffedde1b8b5e82eef558798de4146
2021-10-29 14:25:13 +00:00
David Drysdale
010a23aa0d Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853960

Change-Id: I826409f8df39f3228af231df16a84d780c2fada8
2021-10-29 14:06:49 +00:00
David Drysdale
1e3d97de43 Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" 2021-10-29 13:49:07 +00:00
David Drysdale
565ccc70ed KeyMint VTS: check INCLUDE_UNIQUE_ID works
Bug: 202487002
Test: atest VtsAidlKeyMintTargetTest (on CF, O6)
Change-Id: I8bc674b47549aa1133f816c510289774db752e04
2021-10-29 14:39:12 +01:00
David Drysdale
a00cd71e26 Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80 am: b7633b628a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: I2b85bd9989b0605df4df34db4caf55f379ba61ee
2021-10-29 06:42:06 +00:00
David Drysdale
b7633b628a Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: If9c33f5574bfd7b02a035c83eac6359b9339a9c2
2021-10-29 06:24:55 +00:00
David Drysdale
0e3027ab80 Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: If9f70170cf065013e39a1439ff1f5b85715f4dac
2021-10-29 06:12:38 +00:00
David Drysdale
153bbc9cc5 Merge "Specify KeyMint EC keys by curve not size" 2021-10-29 05:54:57 +00:00
Bob Badour
a88d5b1cb3 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  health/aidl/Android.bp
  health/aidl/default/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I24a0212a955a084c795990653c45b60ebda33357
2021-10-28 17:18:27 -07:00
Alice Kuo
84e8767649 Add bluetooth.audio@2.2 implementation
Bug: 201292721
Bug: 150670922
Bug: 197297498
Test: m android.hardware.bluetooth.audio@2.2-impl
Change-Id: I224b1e001337165e5191060f0ae532933a419b68
2021-10-29 03:37:36 +08:00
Yifan Hong
d4228e5de4 Merge "health: Add default impl of health AIDL HAL" am: 236fa8908c am: 8fe0dacf4f am: 5b3a4eb7a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550322

Change-Id: If4ec856ad66e848944161e0787dab09e16730111
2021-10-28 03:45:44 +00:00
Yifan Hong
5b3a4eb7a2 Merge "health: Add default impl of health AIDL HAL" am: 236fa8908c am: 8fe0dacf4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550322

Change-Id: I9dd9de1ad1e913fc09cddc498371ddf85e70101a
2021-10-28 03:31:48 +00:00
Yifan Hong
8fe0dacf4f Merge "health: Add default impl of health AIDL HAL" am: 236fa8908c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1550322

Change-Id: I882566f05cb4b8ca32c7c19595e51008330b5ec2
2021-10-28 03:17:28 +00:00
Yifan Hong
236fa8908c Merge "health: Add default impl of health AIDL HAL" 2021-10-28 02:57:56 +00:00
Jayachandran Chinnakkannu
6c86b611ba Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a am: 43d81bfc35 am: 0bdb66adb3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: Ib5f725a4dc45a7b3a269586d817fd57673edd253
2021-10-28 01:56:46 +00:00
Jayachandran Chinnakkannu
0bdb66adb3 Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a am: 43d81bfc35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: I086e83a5e756a228382e7020199ab9bda4a848c2
2021-10-28 01:38:28 +00:00
Jayachandran Chinnakkannu
43d81bfc35 Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: I66a4c7ce6d1a496ab897f66f98a748a5cf920e2b
2021-10-28 01:19:09 +00:00
Jayachandran Chinnakkannu
b311ffdb2a Merge "Do not assert CardState::PRESENT on sim power down" 2021-10-28 00:56:00 +00:00
Jordan Liu
13d864a421 Do not assert CardState::PRESENT on sim power down
Bug: 203031664
Test: manual
Change-Id: I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050
Merged-In: I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050
2021-10-28 00:55:51 +00:00
Treehugger Robot
29ca7e4087 Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104 am: fab5684ffe am: bdc8c88352
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859827

Change-Id: I719ab5ea32b8b7d83732fd6023cb3a824150f3ab
2021-10-27 20:54:42 +00:00
Sooraj Sasindran
1050f3afcc Merge "NITZ API improvement" am: bb347323d0 am: 4d791aef1b am: 66b9465fc8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: Ief3ecec9e1c12d1dbd7691e7965f0430692a4f9b
2021-10-27 20:54:29 +00:00
Treehugger Robot
bdc8c88352 Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104 am: fab5684ffe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859827

Change-Id: Ib74878bcdbaf3a6685c8c45b90429ffea9f37ccd
2021-10-27 20:35:59 +00:00
Sooraj Sasindran
66b9465fc8 Merge "NITZ API improvement" am: bb347323d0 am: 4d791aef1b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: I4c33c1e3214fbc837ad43b6ca3b0e3b27f52dbe4
2021-10-27 20:35:49 +00:00
Treehugger Robot
fab5684ffe Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1859827

Change-Id: I516d258184f313497e957f33958eece2c7a30eb9
2021-10-27 20:15:45 +00:00
Sooraj Sasindran
4d791aef1b Merge "NITZ API improvement" am: bb347323d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: Ia5d297d7692f14bcd761b8b9a42e927270c2ee38
2021-10-27 20:15:38 +00:00
Treehugger Robot
9fec2f0104 Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" 2021-10-27 19:53:09 +00:00
Sooraj Sasindran
bb347323d0 Merge "NITZ API improvement" 2021-10-27 19:49:15 +00:00
Sukesh Srikakula
1e2b234392 Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()
As part of an optimization, H4Protocol::Send() is modified to
use writev() instead of WriteSafely(), which has a retry logic
to send remaining bytes if the underlying write() call couldn't
transfer all the bytes in a single system call. This cl is now
adding this missing retry logic to this function.

Bug: 198992020
Test: H4 UTTest, Bluetooth functional test.

Change-Id: I78fad886d52f0910c83b000d5768128f00d3ddbc
2021-10-27 11:21:38 -07:00
Ian Hua
cc144fffe5 Add FL6 spec tests to AIDL VTS. am: ca46f9768c am: 65a058482b am: 1a1d9d0325
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866682

Change-Id: I2188510948e8964f4a4c8e33648f6a960914d01b
2021-10-27 16:38:50 +00:00
Ian Hua
1a1d9d0325 Add FL6 spec tests to AIDL VTS. am: ca46f9768c am: 65a058482b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866682

Change-Id: Idc24a0482b0d519a10572d236980de1cf50bacc1
2021-10-27 16:20:36 +00:00
Ian Hua
65a058482b Add FL6 spec tests to AIDL VTS. am: ca46f9768c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1866682

Change-Id: Id4fe712adc08793e48263183d0ab958517048681
2021-10-27 16:00:58 +00:00
Alice Kuo
965138aac1 Add hidl 2.2 for LE audio support
1. Add mode and difference config type for the unicast/broadcast
2. Support multiple audio configuration with broadcast
3. Add the streamMap for unicast/broadcast

Bug: 201292721
Bug: 150670922
Bug: 197297498
Test: m android.hardware.bluetooth.audio@2.2
Change-Id: Ib95850a7e56e9a03c5b400acdaf0625f0aa8726f
2021-10-27 22:09:01 +08:00
Ian Hua
ca46f9768c Add FL6 spec tests to AIDL VTS.
Also skip FL6 (AIDL_V2) tests for older AIDL drivers.

Bug: 203038813
Test: VtsHalNeuralnetworksTargetTest
Specifically, for old driver such as AIDL_V1 sample driver, it can pass
HIDL tests and skip AIDL_V2 tests. For new driver such as AIDL_V2
sample driver, it can pass all tests.

Change-Id: I689fef0945428f6548977628e3c43628dd1e5bf7
2021-10-27 11:55:25 +01:00
Yifan Hong
830cdb119e health: Add default impl of health AIDL HAL
Compared to the HIDL HAL implementation,
- libhealthloop (and the HealthLoop class) is kept
- Create libhealthaidlimpl that replaces libhealth2impl. Fork the implementation because
  libhealth2impl is highly coupled with HIDL’s design rationale. This includes forking:
  - HalHealthLoop
  - Health implementation
- Combine the passthrough Health and hwbinder BinderHealth classes into the AIDL
  implementation of Health. This is because AIDL does not support passthrough transport.
  Separating the implementation for the two transports in HIDL does not make sense for AIDL.
- In HIDL, a BinderHealth is a HalHealthLoop which is composed of a (passthrough)
  Health implementation. As a result of this change, in AIDL, a Health implementation
  is a HalHealthLoop, which associates with the Health implementation itself with a raw
  pointer.
- hidl_death_recipient becomes ScopedAIBinder_DeathRecipient
- Callback becomes LinkedCallback

Test: manual
Bug: 177269435
Change-Id: I76e914117ce09b218cdb9d655f2135d29bb629ae
2021-10-26 23:53:55 -07:00
Michael Butler
ebab2cdef5 Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c am: b9aff55ad9 am: 6109e931d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863342

Change-Id: I862aecc52c8c7858f4de59d73fbe94d32c693935
2021-10-27 01:06:04 +00:00
Michael Butler
6109e931d9 Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c am: b9aff55ad9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863342

Change-Id: Ib1a182ec0b8b2f8d5971747eac4ed67c4b0beb24
2021-10-27 00:39:28 +00:00
Michael Butler
b9aff55ad9 Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1863342

Change-Id: Ie2dadd254c67ca24e7350b5e6d7e501c8bc6d703
2021-10-27 00:20:55 +00:00