Commit graph

5595 commits

Author SHA1 Message Date
Shawn Willden
42b625b3e8 Merge "Delete KM1" am: 833a929d85 am: 22453fa420
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: I46a1e39f3bd5695e17ad55cea390ee9ba63c66b8
2021-10-09 01:19:58 +00:00
Shawn Willden
22453fa420 Merge "Delete KM1" am: 833a929d85
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: Ib655ba270642c696cae1dcb58830142340dbce1c
2021-10-09 01:03:05 +00:00
Shawn Willden
833a929d85 Merge "Delete KM1" 2021-10-09 00:46:52 +00:00
Xin Li
8de78e5f89 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: I7cf686dad0de9efe6bcd664bb0cb1420578df37d
2021-10-08 01:39:04 +00:00
Xin Li
d3e53d6ea0 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: Ie4c3c0f01b8067b6a472e63c8ad6326f44e7fbbf
2021-10-08 01:19:38 +00:00
Xin Li
77d993075f Merge "Merge Android 12" 2021-10-07 23:50:16 +00:00
Xin Li
86aecefe76 Merge Android 12
Bug: 202323961
Merged-In: I9d5a74b5189e6b445ef922da0f81884d60ac82f4
Change-Id: Ie7a0d96ee03857543b7fb2bfe17ca95fc6f0c7ae
2021-10-06 22:53:41 +00:00
Shawn Willden
9bba111014 Delete KM1
Test: Build
Change-Id: I8abb9c570db05599e3d062810427859ea784d47f
2021-10-06 13:08:40 -06:00
Xin Li
ceff5ecf17 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: I38a17ffc270cc365a8b17315149d236fd4696035
2021-08-17 18:35:33 +00:00
Xin Li
1a7761431d Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I8d13832dd297c5ca7ddeb87fb5302e5bad82c309
Change-Id: I9d5a74b5189e6b445ef922da0f81884d60ac82f4
2021-08-14 06:30:58 +00:00
Andy Hung
920309b25f USB Audio Hal: Fix CTS timestamp handling am: 61583424ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I8d13832dd297c5ca7ddeb87fb5302e5bad82c309
2021-07-05 07:31:50 +00:00
Andy Hung
61583424ff USB Audio Hal: Fix CTS timestamp handling
Bug: 192702566
Test: atest AudioRecordTest#testTimestamp
Change-Id: I3f045b309c8a95ecbe042fd9222e627cac2cb1c9
2021-07-02 17:57:16 -07:00
Treehugger Robot
910783ccd8 Merge "add is_valid to oob data" am: f1b6a25970 am: 37b2639e96
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1740145

Change-Id: I8613409beb35df171e8beacd187f4dfd5a255e71
2021-06-28 18:37:52 +00:00
Treehugger Robot
37b2639e96 Merge "add is_valid to oob data" am: f1b6a25970
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1740145

Change-Id: Ie46270f7ef2e71ee093eae47d15692bae84b07eb
2021-06-28 18:20:48 +00:00
Treehugger Robot
f1b6a25970 Merge "add is_valid to oob data" 2021-06-28 18:07:27 +00:00
Martin Brabham
44e1aaab15 add is_valid to oob data
Bug: 178007935
Test: manual, test app
Tag: #feature
Change-Id: I9ba3639904471a4c34d8f5df753c416e149749c7
2021-06-18 10:18:31 -07:00
Andy Hung
aa6849af11 USB audio hal: Support FCC_LIMIT for 22.2 testing am: df51120802
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/14894689

Change-Id: Ib04f464dd0ca2d56da1236b2c981c861be570e51
2021-06-09 20:04:31 +00:00
Andy Hung
df51120802 USB audio hal: Support FCC_LIMIT for 22.2 testing
Test: dedicated test with FCC_LIMIT = 12, 24
Bug: 189325443
Change-Id: I4a54b77c013e44bef02d612a2b93dfe71b300e32
2021-06-08 07:13:16 -07:00
Yifan Hong
b562c5633e Merge "Use libgtest_prod_headers." am: 7749ef2a4a am: fc3c4d6cb4 am: 09df2e2c96
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1687225

Change-Id: I19e5fa41a24414e66153b8cf868c04f97983f330
2021-04-28 22:12:03 +00:00
Yifan Hong
09df2e2c96 Merge "Use libgtest_prod_headers." am: 7749ef2a4a am: fc3c4d6cb4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1687225

Change-Id: I65e42ca0a082bc3c90994a35d8451d530a5afe91
2021-04-28 21:55:02 +00:00
Yifan Hong
fc3c4d6cb4 Merge "Use libgtest_prod_headers." am: 7749ef2a4a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1687225

Change-Id: I519b644d9185facea7a212063c61e287c809ef6a
2021-04-28 21:21:54 +00:00
Yifan Hong
7749ef2a4a Merge "Use libgtest_prod_headers." 2021-04-28 20:53:30 +00:00
Yifan Hong
bb1479b00b Use libgtest_prod_headers.
Test: builds
Bug: 185916167
Change-Id: Ifdb71aa9e6e9eeadd4d7c9cb4850832650dd12e8
2021-04-26 16:36:38 -07:00
Treehugger Robot
41628fee87 Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6 am: ffabaf42ef
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: I3abaeee2a533fbd6b4f989ae6770bd724d96e295
2021-03-22 10:44:23 +00:00
Treehugger Robot
ffabaf42ef Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: Id212ce97c334db8cde44781065f70344c183cf40
2021-03-22 09:55:02 +00:00
Treehugger Robot
38e37ba4c6 Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: I51c3439b5427c593755f8b46be56a05abc70064a
2021-03-22 09:14:45 +00:00
Treehugger Robot
6ca3fb08ca Merge "r_submix: Implement get_capture_position" 2021-03-22 08:40:25 +00:00
Treehugger Robot
a78ed07b45 [automerger skipped] Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10 am: 157000483e -s ours
am skip reason: skip tag Change-Id Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 with SHA-1 63e4dc0237 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I778d15970443651b3b33287710cf545d687ea305
2021-03-19 22:51:00 +00:00
Treehugger Robot
157000483e Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I589fdd3ed84c0221059a8c87cae1eae217aeb594
2021-03-19 22:10:33 +00:00
Treehugger Robot
a0662b0c10 Merge "Update oob data struct" am: f2c4a568cc
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I3c401d8fed1fcaf012fcf6947e266e0650934614
2021-03-19 21:37:27 +00:00
Treehugger Robot
f2c4a568cc Merge "Update oob data struct" 2021-03-19 21:13:18 +00:00
Mikhail Naganov
8c97d24e3a r_submix: Implement get_capture_position
IStream.getCapturePosition becomes mandatory in
audio HAL V7. The legacy implementation must
provide it for the default HAL implementation.

Bug: 161253754
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I2f2094f0499ba85f53f291e0a269211981b4c9d8
2021-03-17 13:19:49 -07:00
Martin Brabham
7094c89e5c Update oob data struct
Bug: 178007935
Test: compiles and runs
Tag: #feature
Change-Id: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
Merged-In: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
2021-03-15 19:29:22 +00:00
Martin Brabham
63e4dc0237 Update oob data struct
Bug: 178007935
Test: compiles and runs
Tag: #feature
Change-Id: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
2021-03-15 10:22:11 -07:00
Paul Crowley
248ac03b14 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4 am: 62b0336ba4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd13d8f749112c01a9eb0a77c6d3975e2bc421ff
2021-03-01 08:06:31 +00:00
Paul Crowley
62b0336ba4 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93ac1f32ccc574893cd961d453c4b699b843e5e2
2021-02-27 08:23:13 +00:00
Paul Crowley
e92e08a8a4 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26af986c4429e48c6ec492c8bf32a34931e9e585
2021-02-27 07:25:36 +00:00
Paul Crowley
43972e7d10 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" 2021-02-27 05:05:50 +00:00
Xin Li
218e0c7bd9 [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours am: fb880b4133 -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If81c8ccdc5de1a5e4a8856421d31eabbedb11a14
2021-02-20 17:29:01 +00:00
Bob Badour
df8e00240f Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c am: 254f2f1062
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94a1f76615214a26e33712c0a351ace4f0126527
2021-02-20 17:22:58 +00:00
Xin Li
fb880b4133 [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b6a64310951a60c31aed3907fef4fa197228c23
2021-02-20 12:04:53 +00:00
Xin Li
706a6ab36d Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I6b99e5e590504bda7f681ae6cdd7557f74402378
Change-Id: I95c93d049f84bb0b88d87533ade5f7cf715e074f
2021-02-20 00:24:30 -08:00
Bob Badour
254f2f1062 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dd468eb50943dbfc53b443c84ba8fe87ae76a45
2021-02-19 02:25:24 +00:00
Bob Badour
c623db5c2c Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice476cfd865dc5b9ef4a03006800505aff83c4b0
2021-02-19 00:58:31 +00:00
Bob Badour
a3888bdcb9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" 2021-02-18 23:43:48 +00:00
Paul Crowley
1f4800f20a Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error
Test: Treehugger
Bug: 176450483
Change-Id: Ibfc838496fec507dbe4831e86b933666296a4b35
2021-02-18 09:50:56 -08:00
Shawn Willden
6cb2144e0e Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3 am: d34829254c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b34e86622d8b0505ed76621cf2ebbce1b9190fd
2021-02-17 20:49:09 +00:00
Shawn Willden
d34829254c Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieda93f65ca1c441e85bb5351450c0e4684142ee7
2021-02-17 20:14:55 +00:00
Shawn Willden
a5d7ebd9a3 Merge "Add ATTEST_KEY" am: 41e68bfb11
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909a2e2b5aad3d1bcce88f055a4569621a6c97df
2021-02-17 19:42:22 +00:00
Shawn Willden
41e68bfb11 Merge "Add ATTEST_KEY" 2021-02-17 19:12:20 +00:00