Commit graph

1731 commits

Author SHA1 Message Date
Nate(Qiang) Jiang
9e0a2386ab Merge "[Aware] Wifi Aware 4.0 legacy HAL change" 2022-12-20 02:25:18 +00:00
TreeHugger Robot
22aa713e81 Merge "Add frequency/Bandwidth to RttResults" 2022-12-19 17:40:20 +00:00
Sunil Ravi
6fb46c645e Add frequency/Bandwidth to RttResults
Added frequency and RTT packet bandwidth in rtt
results data structure. Also added new rtt result callback
function. The newer vendor implementations which supports
sending frequency and bandwidth should call rtt result callback
version 2.

Bug: 222186547
Test: hardware/interfaces/wifi/aidl/default/tests/runtests.sh
Test: RTT test using wifi rtt scan app from playstore.
Change-Id: I3265baa477b73cddaff49cd4d9ee88692878365c
2022-12-16 21:57:16 +00:00
Mahesh KKV
d937de94dd wifi: Add radio_id and frequency to link layer stats
These two new parameters helps to find the mapping between link layer
stats, radio stat and channel info.

Bug: 258013268
Test: Builds successfully
Change-Id: I6bec665b581020c8b27ed2685c684d5ef8bf4107
2022-12-16 05:42:25 +00:00
Mahesh KKV
832ef8ef71 wifi: Add multi link stats support to legacy HAL
Multi-link operation (MLO) is considered a key feature in IEEE 802.11be,
which allows devices to transmit and receive data using multiple links
concurrently, thereby contributing to improving throughput and reducing
latency.

Currently HAL supports querying stats from single link. Add a callback
to get stats from multiple links supported by the Wi-Fi chip. Also keep
the callback to get single link layer stats as it is for backward
compatibility.

Multi link stats callback can be used for legacy case as well with
single link.

Bug: 246988155
Test: Builds successfully
Change-Id: Iea2649b6868e9b153ae31e5c05457c324f5b4e98
2022-12-15 02:37:50 +00:00
Nate Jiang
c4b6fa85b7 [Aware] Wifi Aware 4.0 legacy HAL change
To support Wifi Aware 4.0 with pairing

Bug: 249185683
Test: CtsWifiTest

Change-Id: I829a770b9a6ba2a3324d8d227d23e0ad2cdc0ac9
2022-12-13 17:58:15 -08:00
Purushottam Kushwaha
2832940b56 wifi_hal: Add interface to get driver supported iface combinations
Interface combinations may vary based on underlying hardware/firmware
and driver support. Add a new API to query the interface combination
matrix through vendor hal.

Bug: 249351396
Test: Build successfully
Change-Id: I51dae4b182ef60a0ab4f1b16d624c69e0a3aebc4
2022-12-13 00:00:59 +00:00
Sunil Ravi
7d67567dd8 wifi: Add number of TDLS sessions in chip capability
Bug: 240247868
Test: Manual - STA connect/disconnect
Change-Id: I54417931d4634085a9de490b9b07029b0c3c7b7f
2022-12-12 19:36:11 +00:00
Mahesh KKV
cac6d2ece8 wifi: Add HAL API to get wifi chip capabilities
Bug: 231497844
Test: Builds successfully
Change-Id: Ie7192ad484a9ecef3c6c98d03710af32c5558904
2022-12-12 19:36:07 +00:00
kensun
31684a15c2 Add HAL APIs to query cached scan results
Add HAL API to retrieve the on-chip scan results.

Bug: 232030878
Test: New API works fine
Change-Id: I0487d010078f4e33fef76a951cc87647746ac867
2022-11-10 02:30:49 +00:00
Xin Li
047d12b20a [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 19372f6f86 -s ours am: 6bba6f6e8b -s ours am: e02615b747 -s ours am: 78512d07d8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: Ia1d4c37b7fe5c80a40e9ea3976ce0f4adf8e9176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 06:52:25 +00:00
Xin Li
459695f527 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ef7af70346 -s ours am: ef42f25735 -s ours am: 46723493b3 -s ours am: 4ff12dc0b0 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I504792392be3c191bc1f5005b36c385aeebfe2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 06:52:23 +00:00
Xin Li
78512d07d8 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 19372f6f86 -s ours am: 6bba6f6e8b -s ours am: e02615b747 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I1ff719fb25245e49794f78c54ce94668e012eb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:35:34 +00:00
Xin Li
4ff12dc0b0 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ef7af70346 -s ours am: ef42f25735 -s ours am: 46723493b3 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I80f2d162b3a8ede8952c16e1cd9ca1d3b716ad9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:35:33 +00:00
Xin Li
e02615b747 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 19372f6f86 -s ours am: 6bba6f6e8b -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: Ib8c6ea931d1212781a7e118f61c9f22813746116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:13:12 +00:00
Xin Li
46723493b3 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ef7af70346 -s ours am: ef42f25735 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I1ff7d8c6d9be45f95dc834b2d6f56b4ebdd830fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:13:11 +00:00
Xin Li
6bba6f6e8b [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 19372f6f86 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I23aa1be1007301a0c1b05608a613b82e5acbea5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:09:50 +00:00
Xin Li
ef42f25735 [automerger skipped] DO NOT MERGE - Merge Android 13 am: ef7af70346 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2186772

Change-Id: I10de865da777605b0ce46e56598e49f3d1f5e59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:09:49 +00:00
Xin Li
19372f6f86 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:26 +00:00
Xin Li
ef7af70346 DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I907687a4d71f48869617edc6e013639dfbccb851
Change-Id: Ib7aa70c369837edcf81d2840cb8a7c4f9f9f493b
2022-08-15 22:03:53 -07:00
Xin Li
367f62ddc7 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6ed3eb181a -s ours am: b97e68ca83 -s ours am: 39f398ac20 -s ours am: 197f8ae90d -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/19094442

Change-Id: I86d75b512e2ca03da90610739d96c31d3409552e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 01:04:34 +00:00
Xin Li
197f8ae90d [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6ed3eb181a -s ours am: b97e68ca83 -s ours am: 39f398ac20 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/19094442

Change-Id: I3587158434b441534691180ae480ec252082926d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:02:01 +00:00
Xin Li
39f398ac20 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6ed3eb181a -s ours am: b97e68ca83 -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/19094442

Change-Id: I1047a3d9e91a8749917f9f60e2de5a3d0401b73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:18 +00:00
Xin Li
b97e68ca83 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6ed3eb181a -s ours
am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/19094442

Change-Id: I11738fa3638344f64b41ef5a74d01b114c1d4262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:12:47 +00:00
Xin Li
6ed3eb181a Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I907687a4d71f48869617edc6e013639dfbccb851
Change-Id: I41b1f19fe185cb4c19f49342b69391b2ba4638d6
2022-06-27 23:38:54 +00:00
Isaac Chiou
a7cdf35d08 Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: 987d8ecbe5 am: 9b2aa1a36a am: 7a0c63d635
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I783dec1f35b7cf788e736c8cfce218cbbea328e5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 08:10:14 +00:00
Isaac Chiou
b048a09ced Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801 am: a92553e540 am: c3dc380d8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: Ib54cdb0938ae2e535f05f724f090ffc505403210
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 08:09:50 +00:00
Isaac Chiou
9bcd9efd2d Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801 am: 47482b2a15 am: 4c4dbdd53c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I9b12cb19a17a0c63cf1dc9a0966175b66e7761b4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 08:08:59 +00:00
Isaac Chiou
7a0c63d635 Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: 987d8ecbe5 am: 9b2aa1a36a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I9e7d87b3d69368cfef271755b0c6d169b73acc8c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:49:04 +00:00
Isaac Chiou
c3dc380d8b Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801 am: a92553e540
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: Id14b4b70e772b9848fdf5a3d340a3e6fef364445
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:48:15 +00:00
Isaac Chiou
4c4dbdd53c Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801 am: 47482b2a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: If883603c30ccbd5f4c588e43889651c0b2976f03
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:47:51 +00:00
Isaac Chiou
9b2aa1a36a Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: 987d8ecbe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I47e222b9ee47b2208fea3cd17de2d95de02a5c66
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:27:22 +00:00
Isaac Chiou
a92553e540 Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I20aea902506a85291f3d863dc9c81cb2257d5464
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:27:02 +00:00
Isaac Chiou
47482b2a15 Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: fa4cbc5801
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I4984b78589b54aa37851c268f682ed9fa536e096
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:27:00 +00:00
Isaac Chiou
c5e9e3ffe3 Add HAL APIs and configurations for Tx power limits am: 4172a388c7 am: 9bd4a7ddb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: Ia003a4cd71a5ea6a91a0def9b868e34d10fd182a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:26:33 +00:00
Isaac Chiou
fa4cbc5801 Add HAL APIs and configurations for Tx power limits am: 4172a388c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: Ib9ebb21ba74eeae893770cf507a62b3d07b5c651
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:52:16 +00:00
Isaac Chiou
9bd4a7ddb2 Add HAL APIs and configurations for Tx power limits am: 4172a388c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I8905e2cad2d855bfe41445d97f93d13ee43f8eb3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:51:18 +00:00
Isaac Chiou
987d8ecbe5 Add HAL APIs and configurations for Tx power limits am: 4172a388c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/17219204

Change-Id: I18bacb93b8587330d4f6f849cf04cb9f3661ef7b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:50:59 +00:00
Isaac Chiou
4172a388c7 Add HAL APIs and configurations for Tx power limits
To lower the instantaneous battery current draw of WiFi, we provide
a way to allow PowerManager to enable/disable Tx power limits.
In this CL,
we define an API in WiFi HAL, and can be referenced by Broadcom HAL.

Bug: 215193418
Test: New APIs work fine
Change-Id: I907687a4d71f48869617edc6e013639dfbccb851
2022-04-21 11:17:02 +08:00
Xin Li
0b57388360 [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours am: a72a61bce3 -s ours am: 19f94a810b -s ours am: aeacd9bda3 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I6739e7eedd16b81537f17388a8f7b6b34b3f1565
2022-03-09 12:09:18 +00:00
Xin Li
c800ccb884 [automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -s ours am: ac127a77a1 -s ours am: a66c63c864 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: Ic813b957b53826b8b5e659d366d85162641748fb
2022-03-09 12:06:28 +00:00
Xin Li
3a4e61a25a [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours am: a72a61bce3 -s ours am: 19f94a810b -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I214cc2104d08726b9b23f46d7b44b2fa992fddec
2022-03-09 11:39:25 +00:00
Xin Li
aeacd9bda3 [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours am: a72a61bce3 -s ours am: 19f94a810b -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I6e67b72e087d2db24abe804531e71aa6252c8b6a
2022-03-09 11:39:13 +00:00
Xin Li
51e958b880 [automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -s ours am: ac127a77a1 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I99fdc58fdc59341c26cbc655f2c9d47edc6a374a
2022-03-09 11:36:36 +00:00
Xin Li
a66c63c864 [automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -s ours am: ac127a77a1 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I1b040732963cbba14513ff8c6e86e0be60019852
2022-03-09 11:36:23 +00:00
Xin Li
19f94a810b [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours am: a72a61bce3 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: Iaf45cd843eea46396dcd66c947ef462027cd3a79
2022-03-09 10:05:17 +00:00
Xin Li
ac127a77a1 [automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: Id59c7a7e20f44b2148f658c1f23dd4bb85b8e51c
2022-03-09 10:02:26 +00:00
Xin Li
a72a61bce3 [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I09a86f6de73ef9b02bbe89a67cd9104db6303d02
2022-03-08 11:06:47 +00:00
Xin Li
46143e52bc [automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: Id2e36773bf86976aa38c0a297ef31a8b4c8ff8e5
2022-03-08 11:03:56 +00:00
Xin Li
3def5591b0 [automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: Id16f34a7e7fa609854a4436ca98152fa4ba2b067
2022-03-08 10:22:00 +00:00