Commit graph

56166 commits

Author SHA1 Message Date
Mikhail Naganov
85579a4291 [automerger skipped] Merge changes from topic "primary-aidl-hal" into udc-qpr-dev am: 85abc3148d -s ours
am skip reason: Merged-In Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43 with SHA-1 4bf6899cc7 is already in history

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

Change-Id: Ie30b7c675f6467cff8366cf3193c80d35f6fbba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 16:45:13 +00:00
Mikhail Naganov
2404d158c5 [automerger skipped] audio: Ensure proper priority and scheduler for service threads am: ad50acdd5c -s ours
am skip reason: Merged-In Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43 with SHA-1 4bf6899cc7 is already in history

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

Change-Id: I25cec9d850e8778436fb3eab89511593e3497277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 16:45:09 +00:00
Mikhail Naganov
85abc3148d Merge changes from topic "primary-aidl-hal" into udc-qpr-dev
* changes:
  audio: Ensure proper priority and scheduler for service threads
  audio: Implement the major functionality of the primary CF HAL
  audio: Make renamings suggested by reviewers
2023-08-09 16:12:52 +00:00
Eric Biggers
a6d324a39b Merge "Test that the password isn't truncated (again)" into main am: 15d95e8d65 am: d699154bd1 am: 2dc46dc7d6 am: 361f7be3a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696111

Change-Id: I35bb68437233e0aa2ae6912013fa3c38a73ecce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:41:29 +00:00
Henry Fang
98b23ff9b6 Merge "CAS: Add SYS_NICE Capability" into main am: 15ec04889d am: e77a471fd4 am: 8ccc9e7114 am: 44ec3cb0ed
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696777

Change-Id: I71f7509a9c775f04291b3a09c41a6ed51dd3036e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:40:52 +00:00
Shreshta Manu
7e33d42da6 [uwb-interfaces] Add support for prioritized channel list am: 595041e6fb am: c00217cc26 am: a37c2d0a9f am: f3be76993a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2698595

Change-Id: I2b4195ac05ecbc3e9183074b49e555c0892eddf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 01:40:19 +00:00
Eric Biggers
361f7be3a6 Merge "Test that the password isn't truncated (again)" into main am: 15d95e8d65 am: d699154bd1 am: 2dc46dc7d6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696111

Change-Id: If62ac40da0a7d19ad6de3c3fcf326c32ebef505b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:58:59 +00:00
Henry Fang
44ec3cb0ed Merge "CAS: Add SYS_NICE Capability" into main am: 15ec04889d am: e77a471fd4 am: 8ccc9e7114
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696777

Change-Id: I45c0da601d48ee691300f61be671043f21f8d3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:58:47 +00:00
Shreshta Manu
f3be76993a [uwb-interfaces] Add support for prioritized channel list am: 595041e6fb am: c00217cc26 am: a37c2d0a9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2698595

Change-Id: I3aa95c87fee3dc81b4cad55ce1e12a1275674800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:58:32 +00:00
Eric Biggers
2dc46dc7d6 Merge "Test that the password isn't truncated (again)" into main am: 15d95e8d65 am: d699154bd1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696111

Change-Id: I458acf01f95551b8986f3ca109af8586ca692091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:13:27 +00:00
Henry Fang
8ccc9e7114 Merge "CAS: Add SYS_NICE Capability" into main am: 15ec04889d am: e77a471fd4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696777

Change-Id: I5caef5ee68a23f77a664de3f1f38834477434d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:13:14 +00:00
Shreshta Manu
a37c2d0a9f [uwb-interfaces] Add support for prioritized channel list am: 595041e6fb am: c00217cc26
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2698595

Change-Id: Iaaba68f5d716d9a94afcea28d8a905146560e093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 00:12:57 +00:00
Eric Biggers
d699154bd1 Merge "Test that the password isn't truncated (again)" into main am: 15d95e8d65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696111

Change-Id: I42b20e5fa539bc78093c02675896a5355dbe593d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:29:28 +00:00
Henry Fang
e77a471fd4 Merge "CAS: Add SYS_NICE Capability" into main am: 15ec04889d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696777

Change-Id: Ic69e02162cefeb6dffa15002ec79076d964efab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:29:16 +00:00
Shreshta Manu
c00217cc26 [uwb-interfaces] Add support for prioritized channel list am: 595041e6fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2698595

Change-Id: I7e374c48b473348d532f3de0c2937e0de9f93f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:29:00 +00:00
Eric Biggers
15d95e8d65 Merge "Test that the password isn't truncated (again)" into main 2023-08-08 23:21:36 +00:00
Henry Fang
15ec04889d Merge "CAS: Add SYS_NICE Capability" into main 2023-08-08 22:44:19 +00:00
Sarah Chin
0e21ce62b3 VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: 83238b5415 am: d5e9f6edde
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I39df939acc8324bb083c7a5308cf63c654ed117b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 22:00:29 +00:00
Sarah Chin
25a91d387e VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: a754fb7569 am: 5895cf0ead
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I8b4c0c14b0a8d90afd9f179e02bbfa20e2b1151a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 22:00:08 +00:00
Sarah Chin
55362116ce VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: a754fb7569 am: dcc65006d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I0b3dcd2ec0cb9a202e3a9eabde3a2ef9ed00c81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:58:16 +00:00
Sarah Chin
d5e9f6edde VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: 83238b5415
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I3047df390ac45a2d85f8ae5d2b1f24974d031365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:35:13 +00:00
Sarah Chin
dcc65006d4 VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: a754fb7569
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: Ied1259ade427503b62d3dda7371985c2e684bbdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:13:36 +00:00
Sarah Chin
5895cf0ead VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502 am: a754fb7569
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I56d7cbc4f43110e099becc5ac89fe7634623d5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 21:12:14 +00:00
Sarah Chin
83238b5415 VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: If31ae86f57ad4a8e51def149a1e5541a27de9c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 20:49:57 +00:00
Sarah Chin
a754fb7569 VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b am: 80e0490502
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I569250d77fd045a9930ad4facc2671c33aae1485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 20:48:48 +00:00
Sarah Chin
80e0490502 VTS setGetAllowedNetworkTypesBitmap allow reset am: ba1c37e79b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24304951

Change-Id: I7f7276195589beb9bf9223269823f73672ba6224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 20:09:37 +00:00
Shreshta Manu
595041e6fb [uwb-interfaces] Add support for prioritized channel list
Test: compiles
Bug: 293959095
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cef396ca26136d812405e78009e7a1374ca89e5c)
Merged-In: I18da378128b96b73ae457045354d22a4add988d0
Change-Id: I18da378128b96b73ae457045354d22a4add988d0
2023-08-08 20:08:45 +00:00
Mikhail Naganov
ad50acdd5c audio: Ensure proper priority and scheduler for service threads
Change audio worker threads priority to ..._URGENT_AUDIO to match
the coupled thread in the audio flinger.

Set SCHED_FIFO scheduler for FAST threads (also to match AF fast
mixer/capture threads). In order to enable that, grand SYS_NICE
capability to the HAL service process and provide "getTid"
function in the StreamWorker class. For testing, add a "FAST"
output to the "stub" module in the HAL configuration.

Bug: 286914845
Test: atest libaudioaidlcommon_test
Test: atest VtsHalAudioCoreTargetTest
Test: adb shell ps -A -T -o PID,TID,NI,PCY,PRI,RTPRIO,SCHED,CMD
      for the HAL service process during VTS test. For regular
      "reader"/"writer" threads should see 'NI 19, PRI 38',
      for FAST "writer" should see 'NI -19, PRI 43, RTPRIO 3, SCH 1'
Change-Id: Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43
(cherry picked from commit 4bf6899cc7)
Merged-In: Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43
2023-08-08 09:53:26 -07:00
Mikhail Naganov
4f339476d3 audio: Implement the major functionality of the primary CF HAL
Core HAL changes:

1. Add StreamPrimary implemented via StreamAlsa.

2. Align the configuration with the HIDL HAL.

3. Fix position retrieval vs. standby call.

4. Fix sleeps in StreamAlsa.

VTS changes:

1. Use several bursts for stream I/O test scenarios that check
   observable position increase. This is because the position may
   not be available until a couple of transfers have been made.

2. Do not require position increase for the scenarios that do
   not make several bursts. As specified above, the position may
   not have been increased for the ALSA case. Whereas, using
   multiple bursts in all scenarios will increase test time, and
   make the state machine transitions graph more complicated.

3. Hook up the test config file to shut down audioserver during
   VTS tests, fix the test config file.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Test: compare APM dumps for AIDL vs. HIDL
Change-Id: I85271564c664fa40008d60e82b32eaa66a99c68f
(cherry picked from commit cf824f65c8)
Merged-In: I85271564c664fa40008d60e82b32eaa66a99c68f
2023-08-08 09:51:19 -07:00
Mikhail Naganov
7ed9ce5339 audio: Make renamings suggested by reviewers
Rename DriverInterface::getPosition -> refinePosition. This reflects
the fact that the driver may provide more precise position, however
this is an optional operation.

Rename StreamIn/Out::mContext -> mContextInstance. This is
to emphasize that StreamIn/Out actually own the context and they
hold the real context instance, not just a reference/pointer
to it, like other classes involved in the inheritance chain.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id7159f9bf3ee020dc7cf594ec35f5d59d23d7e31
(cherry picked from commit 459b7331e9)
Merged-In: Id7159f9bf3ee020dc7cf594ec35f5d59d23d7e31
2023-08-08 09:50:58 -07:00
David Drysdale
147b459d2c Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc am: b8749b670e am: 6e755eee65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950

Change-Id: I1a50045938f3a566071b8a9e336c9bfca2ee0eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 13:04:41 +00:00
David Drysdale
6e755eee65 Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc am: b8749b670e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950

Change-Id: If1346ac619398e68a006a076d172f84c14f6ff73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 12:18:21 +00:00
David Drysdale
b8749b670e Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950

Change-Id: Ic4f38db75b5c07bb2652b18995559f9ecc6cb099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 11:36:32 +00:00
David Drysdale
da606360cc Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950

Change-Id: I9b15adef6651cf9c35062c4b0bdaeecfef5c1ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 10:53:48 +00:00
Treehugger Robot
a5bf7f8b8f Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494 am: a9d915c5a7 am: e0612ac03e am: 362ca159e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: I3f90e0fef459a68587ecac83e596cffa4967a24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 10:52:12 +00:00
David Drysdale
955fb9e5fc Merge "KeyMint: use a smaller invalid IMEI value" into main 2023-08-08 10:16:23 +00:00
Treehugger Robot
362ca159e0 Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494 am: a9d915c5a7 am: e0612ac03e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: I9cacd35e2719be59c7e6169c65a016c2358dbd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 10:08:34 +00:00
Venkatarama Avadhani
90e664dfa6 CAS: Add SYS_NICE Capability
Add SYS_NICE capability to the CAS services. This will enable the
service to set its priority.

Bug: 286011513
Test: Build
Change-Id: I5cd58a3a9db53fcc004557a8e9f509ebd6291c2d
2023-08-08 15:35:08 +05:30
Treehugger Robot
e0612ac03e Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494 am: a9d915c5a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: I83eab84203e2133b83608e8079a65a56087d5815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 09:21:41 +00:00
Treehugger Robot
a9d915c5a7 Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: Iee943e26ddde7f586e021a722579ed14ef81e5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 08:40:30 +00:00
Treehugger Robot
ff1f1f3494 Merge "audio: Implement the major functionality of the primary CF HAL" into main 2023-08-08 07:56:05 +00:00
Treehugger Robot
84ec846556 Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213 am: 67869eb176 am: 745d16098f am: cdeb0790d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: I782060fa99a8eb428389dc082b19f2d44bb5e9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 05:16:26 +00:00
Treehugger Robot
cdeb0790d2 Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213 am: 67869eb176 am: 745d16098f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: I5a5cab43bb03c7569547353a5f9ba43392f0104e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 04:35:17 +00:00
Treehugger Robot
745d16098f Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213 am: 67869eb176
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: I959a56824684cef008fee0bb265f5755f0cb430b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:49:58 +00:00
Treehugger Robot
67869eb176 Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: Iaad0376514ff74a8daa1b6bb20956ba7aa9b0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:04:14 +00:00
Treehugger Robot
41243dc213 Merge "audio: Ensure proper priority and scheduler for service threads" into main 2023-08-08 02:19:23 +00:00
Treehugger Robot
b0818fe651 [automerger skipped] Merge "Update version for audiocontrol" into main am: 203ca985ce am: 1f232a1cc4 -s ours am: 499e15094d -s ours am: b934ca911c -s ours
am skip reason: Merged-In I17000be75963e511d2a56583be0f619a3dee66f1 with SHA-1 ede24f77e6 is already in history

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

Change-Id: I2f60252451077ccce37e9ef4ab593f10776bb826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:53:56 +00:00
Mikhail Naganov
4bf6899cc7 audio: Ensure proper priority and scheduler for service threads
Change audio worker threads priority to ..._URGENT_AUDIO to match
the coupled thread in the audio flinger.

Set SCHED_FIFO scheduler for FAST threads (also to match AF fast
mixer/capture threads). In order to enable that, grand SYS_NICE
capability to the HAL service process and provide "getTid"
function in the StreamWorker class. For testing, add a "FAST"
output to the "stub" module in the HAL configuration.

Bug: 286914845
Test: atest libaudioaidlcommon_test
Test: atest VtsHalAudioCoreTargetTest
Test: adb shell ps -A -T -o PID,TID,NI,PCY,PRI,RTPRIO,SCHED,CMD
      for the HAL service process during VTS test. For regular
      "reader"/"writer" threads should see 'NI 19, PRI 38',
      for FAST "writer" should see 'NI -19, PRI 43, RTPRIO 3, SCH 1'
Change-Id: Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43
2023-08-07 18:15:19 -07:00
Treehugger Robot
b934ca911c [automerger skipped] Merge "Update version for audiocontrol" into main am: 203ca985ce am: 1f232a1cc4 -s ours am: 499e15094d -s ours
am skip reason: Merged-In I17000be75963e511d2a56583be0f619a3dee66f1 with SHA-1 ede24f77e6 is already in history

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

Change-Id: I1991566f35af5d9dbba6d48a3f6dec96935dfc34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:12:31 +00:00
Treehugger Robot
499e15094d [automerger skipped] Merge "Update version for audiocontrol" into main am: 203ca985ce am: 1f232a1cc4 -s ours
am skip reason: Merged-In I17000be75963e511d2a56583be0f619a3dee66f1 with SHA-1 ede24f77e6 is already in history

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

Change-Id: Ifba08fef001375a39d7be8f4ca3e59d065f8aaf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 00:27:25 +00:00