Commit graph

58590 commits

Author SHA1 Message Date
Mikhail Naganov
ca9d26dc44 Revert "audio: Populate MicrophoneInfo with vendor data" am: 5eea7fb0d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2786756

Change-Id: I4868c14fe3bbd2075743c8d6373e166dabb20802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 23:55:47 +00:00
Mikhail Naganov
bfe40ea2b0 Revert "audio: Set connectedProfiles for non-attached device ports." am: 006a136ea7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2786755

Change-Id: I720af2a3d52b1b65f4898e365ad97fff3ca28c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 23:55:44 +00:00
Mikhail Naganov
a37a4feed2 Revert "audio: Use hardcoded r_submix configuration with XML" am: 567d0de485
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2786754

Change-Id: I5bf9cf0ed6f0b04aea5c06d6cb5bd8c1e863a258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 23:55:40 +00:00
Mikhail Naganov
03a2fbc6a3 Merge changes from topic "revert-2770886-AidlAudioHalModuleConfig-FQCMWOWMCH" into main
* changes:
  Revert "audio: Parse module configurations from the APM XML files"
  Revert "audio: Populate MicrophoneInfo with vendor data"
  Revert "audio: Set connectedProfiles for non-attached device ports."
  Revert "audio: Use hardcoded r_submix configuration with XML"
2023-10-13 23:44:26 +00:00
Mikhail Naganov
5eea7fb0d7 Revert "audio: Populate MicrophoneInfo with vendor data"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I01a4d22056507f9047c4fead21c9a75bfa153a46
2023-10-13 23:38:25 +00:00
Mikhail Naganov
006a136ea7 Revert "audio: Set connectedProfiles for non-attached device ports."
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: Id325171baeabd61d244e5f15c37f7d14402bd426
2023-10-13 23:38:25 +00:00
Mikhail Naganov
567d0de485 Revert "audio: Use hardcoded r_submix configuration with XML"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I7f51ab94f5d42ac052e9900ddd0cc69a33856820
2023-10-13 23:38:25 +00:00
Mikhail Naganov
af75a679c9 Revert "audio: Parse module configurations from the APM XML files"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I0076c88877943d9498f90c477e78a2be5d390150
2023-10-13 23:38:25 +00:00
Steven Moreland
3a28f3de0b [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 -s ours am: 323233ae4d -s ours am: eeb4d30cdd -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Iee60709f9c05446bf4f22b7fd219f32d844eac5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:17:30 +00:00
Yu Shan
d11221251e [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 -s ours am: ecd7e92664 -s ours am: 1cd25687c5 -s ours
am skip reason: skipped by user shanyu

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

Change-Id: I42483906f61beb68a2d99a383e53feefe24d1576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:17:00 +00:00
Steven Moreland
eeb4d30cdd [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 -s ours am: 323233ae4d -s ours
am skip reason: skipped by user smoreland

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

Change-Id: I440aba00cb82df58207e42240e5bacb126666572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:16:44 +00:00
Steven Moreland
5bcb1ebe08 [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 am: 865d96cdac -s ours am: 61e4768fae -s ours
am skip reason: skipped by user smoreland

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

Change-Id: I1fed87a129a4dfdd2192d098f1224b1571ee1df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:16:32 +00:00
Steven Moreland
47b0223eaa OMX: allow in 8
Bug: 293538526
Change-Id: Ieda8e14d23c367c18537d79c28aeea8a9efbec53
Test: N/A
(cherry picked from commit ab586ba7d3)
2023-10-13 22:16:25 +00:00
Yu Shan
1cd25687c5 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 -s ours am: ecd7e92664 -s ours
am skip reason: skipped by user shanyu

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

Change-Id: I46d0e9e06f41f5e1c7237ff6490070421e7ebe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:16:23 +00:00
Yu Shan
7ad42406a5 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 am: 7e87c5c703 -s ours am: a4f61d965c -s ours
am skip reason: skipped by user shanyu

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

Change-Id: If2ad4f877e77ba2d4c0c7bd7fd96b9149eea73e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 22:15:42 +00:00
Steven Moreland
5ef38f9cfb [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 am: 865d96cdac am: d5d0066e82 -s ours
am skip reason: skipped by user smoreland

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

Change-Id: I1bbcd91ec061615fd96637f189b526525545e62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:59:14 +00:00
Steven Moreland
323233ae4d [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Iadba5e868e405f2367e7fe2f529505406cda6e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:58:40 +00:00
Steven Moreland
61e4768fae [automerger skipped] Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 am: 865d96cdac -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Id2b399d2882964484b3c9ce8163f5ea068d21b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:57:40 +00:00
Yu Shan
4652d579ed [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 am: 7e87c5c703 am: e4d34701a7 -s ours
am skip reason: skipped by user shanyu

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

Change-Id: I4ecc6005e386fb235c043286bfcbff0c75e77b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:43:12 +00:00
Yu Shan
ecd7e92664 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 -s ours
am skip reason: skipped by user shanyu

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

Change-Id: I2d7cc92b5b3220c014b644a66108e9d38d2a2762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:42:37 +00:00
Yu Shan
a4f61d965c [automerger skipped] Allow CDD required properties to be absent in VTS. am: 076976eea2 am: 4ccffdb997 am: 7e87c5c703 -s ours
am skip reason: skipped by user shanyu

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

Change-Id: Ia444f52bc236fd25111399053b01fb11ec789e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:42:02 +00:00
Steven Moreland
d5d0066e82 Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389 am: 865d96cdac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2781832

Change-Id: I5cb859ef08ac3ad5fdeae9864f769c968ffefde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:58:17 +00:00
Treehugger Robot
9a4c5a3544 Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda62 am: 5417f10563 am: 45dfe4efad am: b9b5f8335e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2770886

Change-Id: Ib8b400e3e529fa3d03c570f1f83c19038a53221e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:41:33 +00:00
Lorena Torres-Huerta
43fc2a8ee3 audio: Set connectedProfiles for non-attached device ports. am: a29393db39 am: bc48f1dadd am: 14c5da7b45 am: b9457d840a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389654

Change-Id: Ieb1fd29ba1e1a8851f73d5db7477a4dd2c78cac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:41:29 +00:00
Lorena Torres-Huerta
6b7c01e791 audio: Populate MicrophoneInfo with vendor data am: dc9d1a4b42 am: 719170e066 am: ace5c10a4d am: 46d923debf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389656

Change-Id: I35b314f456a66fda2880052181ec6305303d48c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:41:26 +00:00
Lorena Torres-Huerta
99addf244e audio: Parse module configurations from the APM XML files am: 00a7307862 am: 8c04b54e05 am: e8f7b43dc6 am: 395beaa6e1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2363149

Change-Id: If406acc76049a82a4b3b778269bcb7df928f3c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:41:19 +00:00
Steven Moreland
865d96cdac Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972 am: 26e68b8389
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2781832

Change-Id: I333ccc48d1b7ddc1dbb5ff46f2a2230375b21787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:23:06 +00:00
Treehugger Robot
b9b5f8335e Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda62 am: 5417f10563 am: 45dfe4efad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2770886

Change-Id: I7d288d92ba0c4260c045448887798b8dc9499f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:08:44 +00:00
Lorena Torres-Huerta
b9457d840a audio: Set connectedProfiles for non-attached device ports. am: a29393db39 am: bc48f1dadd am: 14c5da7b45
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389654

Change-Id: Ic91c9bf035480cb0bba28b6e70ebf9c614ad0be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:08:41 +00:00
Lorena Torres-Huerta
46d923debf audio: Populate MicrophoneInfo with vendor data am: dc9d1a4b42 am: 719170e066 am: ace5c10a4d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389656

Change-Id: I35cb37c9a0a10eae8c8a72c054601b76f930e49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:08:37 +00:00
Lorena Torres-Huerta
395beaa6e1 audio: Parse module configurations from the APM XML files am: 00a7307862 am: 8c04b54e05 am: e8f7b43dc6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2363149

Change-Id: I6c30b304c3891ce316304a0e030e86f282464a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 18:08:31 +00:00
Roshan Pius
e89c71773d nfc(hal): Make it available for nfc apex
Bug: 303286040
Test: Compiles
Merged-In: I2d70f751867fe02ba2bc6958963e30f128630b00
Change-Id: I2d70f751867fe02ba2bc6958963e30f128630b00
2023-10-13 18:03:41 +00:00
Steven Moreland
26e68b8389 Merge "OMX: allow in 8" into android14-tests-dev am: 9848235972
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2781832

Change-Id: I3a3462d2deaaa1360fefc7529804f86bb2778b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:52:30 +00:00
Treehugger Robot
45dfe4efad Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda62 am: 5417f10563
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2770886

Change-Id: Id0fa3286ede4b24c337a6bf7b66174c52073c7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:35:05 +00:00
Lorena Torres-Huerta
14c5da7b45 audio: Set connectedProfiles for non-attached device ports. am: a29393db39 am: bc48f1dadd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389654

Change-Id: I0cfb75776532fe6675d41d0a048cfe703cd8f5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:35:02 +00:00
Lorena Torres-Huerta
ace5c10a4d audio: Populate MicrophoneInfo with vendor data am: dc9d1a4b42 am: 719170e066
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389656

Change-Id: Ie8d24e53f83e4b6ac28509bf1af93dd28db6f67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:34:58 +00:00
Lorena Torres-Huerta
e8f7b43dc6 audio: Parse module configurations from the APM XML files am: 00a7307862 am: 8c04b54e05
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2363149

Change-Id: If39ebfffc29877be714b826db647c8d7e7b8c36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:34:54 +00:00
Steven Moreland
9848235972 Merge "OMX: allow in 8" into android14-tests-dev 2023-10-13 17:21:03 +00:00
Treehugger Robot
5417f10563 Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda62
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2770886

Change-Id: I2d0a4c3bd8138dfbfc06c1194d3fb59c5a2d88c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:01:46 +00:00
Lorena Torres-Huerta
bc48f1dadd audio: Set connectedProfiles for non-attached device ports. am: a29393db39
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389654

Change-Id: I3674fa2d0180dcf82371553dfaba926a91470663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:01:44 +00:00
Lorena Torres-Huerta
719170e066 audio: Populate MicrophoneInfo with vendor data am: dc9d1a4b42
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2389656

Change-Id: Iab011cb34c67a579620b0dbb2f17a3fae3d48bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:01:41 +00:00
Lorena Torres-Huerta
8c04b54e05 audio: Parse module configurations from the APM XML files am: 00a7307862
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2363149

Change-Id: I14b9fc36e672590e859869bdf854ff29f13dc1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:01:36 +00:00
Alan Stokes
989ccf9b3c Give a name to the ConfigurationDescriptor. am: 8cbbc15bc3 am: bea97ad0f4 am: efec715f20 am: 5e117f0891
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2788152

Change-Id: Ibce8e2ce877e7c6eabea996eb901f6904e74c935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 17:01:00 +00:00
Treehugger Robot
43543bda62 Merge changes from topic "AidlAudioHalModuleConfig" into main
* changes:
  audio: Use hardcoded r_submix configuration with XML
  audio: Set connectedProfiles for non-attached device ports.
  audio: Populate MicrophoneInfo with vendor data
  audio: Parse module configurations from the APM XML files
2023-10-13 16:33:46 +00:00
Alan Stokes
5e117f0891 Give a name to the ConfigurationDescriptor. am: 8cbbc15bc3 am: bea97ad0f4 am: efec715f20
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2788152

Change-Id: I84f2cc7ffc271c78238d4a1e7a7e702336d82d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 16:29:26 +00:00
Alan Stokes
efec715f20 Give a name to the ConfigurationDescriptor. am: 8cbbc15bc3 am: bea97ad0f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2788152

Change-Id: I5cd00c4882fb26a893c8e6a10c4aef78b3ec3f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 15:55:26 +00:00
Alan Stokes
bea97ad0f4 Give a name to the ConfigurationDescriptor. am: 8cbbc15bc3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2788152

Change-Id: I9642991dbed2095b7e6566e142effc42054965f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 15:21:58 +00:00
Alan Stokes
8cbbc15bc3 Give a name to the ConfigurationDescriptor.
Test: N/A
Change-Id: Ia2f4198e97a61494ba50e46fd198ee1f1ad44f0d
2023-10-13 13:43:21 +00:00
David Drysdale
5a16012af5 Merge "RSA OAEP MGF1 digest VTS relaxed for keymint < V3" into main am: 57d13b5d83 am: 0b6455dcc0 am: a61a88ebeb am: a360922453
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758513

Change-Id: Ia42a680bcc61724d6616ead69a5c440973cf9c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 12:53:18 +00:00
David Drysdale
a360922453 Merge "RSA OAEP MGF1 digest VTS relaxed for keymint < V3" into main am: 57d13b5d83 am: 0b6455dcc0 am: a61a88ebeb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758513

Change-Id: I1e1f635044bf3c53066a5f288a94d9b221364069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 12:19:19 +00:00