Commit Graph

57357 Commits

Author SHA1 Message Date
Treehugger Robot
a68be420fd Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5 am: 3f76bf5b23 am: 84816ec99d am: f5af8ff475 am: 2705f61931
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I89154927eaf442ca05a3fcdf92fc1a1cc0e17139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 22:47:09 +00:00
Treehugger Robot
2705f61931 Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5 am: 3f76bf5b23 am: 84816ec99d am: f5af8ff475
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I0a1e32b40dd43768fff70bd8b10d34130beeae88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 22:08:26 +00:00
Treehugger Robot
f5af8ff475 Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5 am: 3f76bf5b23 am: 84816ec99d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: Ie6f0f1847c60ecaafdc418cf900ea36517dd37b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 21:26:02 +00:00
Treehugger Robot
84816ec99d Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5 am: 3f76bf5b23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I8840b5f4925bd801ddf4b39940b6b6246631176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:43:39 +00:00
Treehugger Robot
3f76bf5b23 Merge "Clarify null-termination of name field" into main am: 8328cbb343 am: b47a11c1d5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: Ib526ad1afd6d85d3ed1fe9a8075685d4ba07080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:03:44 +00:00
Mikhail Naganov
467e7d4739 Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584 am: 4491c5c06e am: cea2c900cb am: 29c30ab75e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: I275428dea1952fa5c70b12d59bf33a0f4d033df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 19:39:18 +00:00
Treehugger Robot
b47a11c1d5 Merge "Clarify null-termination of name field" into main am: 8328cbb343
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2651037

Change-Id: I0be35741621afcefa20221a757c74d5cb53501e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 19:21:58 +00:00
Mikhail Naganov
29c30ab75e Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584 am: 4491c5c06e am: cea2c900cb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: I4302b6f81a438cb3d515fe6ede40bd6a58c2fd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 19:00:15 +00:00
Treehugger Robot
8328cbb343 Merge "Clarify null-termination of name field" into main 2023-07-07 18:35:22 +00:00
Mikhail Naganov
cea2c900cb Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584 am: 4491c5c06e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: I9e6fc3cc621d89c09d220f32770ed8ebae75dd50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 18:17:34 +00:00
Mikhail Naganov
4491c5c06e Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: Ifdf792ff09a4cdc6c4c3e27da385c4f692c5420f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 17:36:14 +00:00
Mikhail Naganov
4eae019584 Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: If94688451246d7a3ee4f13206531d1e1bca6490c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 16:54:57 +00:00
Mikhail Naganov
3a4100ec40 Merge "audio: Fix default surround sound config" into main am: 1b5dab3553
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2650299

Change-Id: I7ad3c54925c38c6aa0d732719c8b20e568acae0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 16:11:14 +00:00
John Reck
735206b1a5 Clarify null-termination of name field
Test: make
Change-Id: I22e7c20074fe49bd533fc16c88a979447362d3f2
2023-07-07 12:11:00 -04:00
Mikhail Naganov
1b5dab3553 Merge "audio: Fix default surround sound config" into main 2023-07-07 15:42:07 +00:00
Treehugger Robot
2d948f9422 [automerger skipped] Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb am: 6fd87a9b7e am: e10d5e593e am: 6de1143d57 -s ours
am skip reason: Merged-In Ia3b15f669219a0941498b90a76b42d5f2f5ac80b with SHA-1 dcd2ae7c29 is already in history

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

Change-Id: Ied71871f90688f3857a87b92304ff212456847d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:34:46 +00:00
Treehugger Robot
6de1143d57 Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb am: 6fd87a9b7e am: e10d5e593e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: If5ddf47c5621c410f10c9325bceb6fcdaa1fb86d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:54:27 +00:00
Treehugger Robot
e10d5e593e Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb am: 6fd87a9b7e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I2988cb496fd16accf40f474484620a7ef2352471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:07:46 +00:00
Treehugger Robot
9c5889cecb Merge "Pass property set error to subscribed clients." into main 2023-07-07 01:41:20 +00:00
Treehugger Robot
6fd87a9b7e Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I44b2ecc3703c984b982735e5df1582e6a9fcd14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:22:55 +00:00
Treehugger Robot
80cba87acb Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I1f8cfdd1553fcaf0f6b5d67a3cbbdc4a36d7f3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:39:21 +00:00
Yu Shan
7b1448edcf Pass property set error to subscribed clients.
Pass the async property set error generated by VehicleHardware layer
to subscribed clients

Test: atest DefaultVehicleHalTest
Bug: 286384730
Change-Id: Iadd92e1c0c741ad6450a0508fe9e6301bdfe66c5
2023-07-06 17:18:18 -07:00
Treehugger Robot
73f3e16b78 Merge "Fix flaky recurrent timer test." into main 2023-07-07 00:08:58 +00:00
Treehugger Robot
7e69098f40 Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: Ie8ce1d390a0bb03a02e0ac0c9426022251123aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 23:57:21 +00:00
Lei Ju
1f8f5e55ec Merge "Introduce a new callback function to get client's UUID" into main 2023-07-06 22:33:04 +00:00
Treehugger Robot
099240ae66 Merge "Allow face HAL to be updated via apex in U" into main 2023-07-06 22:06:52 +00:00
Mikhail Naganov
724b24f895 audio: Fix default surround sound config
Ensure that all formats returned by
AudioPolicyConfigXmlConverter::getDefaultSurroundSoundConfig
can be converted into legacy values.

Bug: 290116634
Test: atest audio_policy_config_xml_converter_tests
Change-Id: I3a46ea5ee4805f719c8977064c9d8d681a75cff2
2023-07-06 13:51:37 -07:00
Nataniel Borges
c47a00c90b Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1 am: a777c5437e am: ef4267d45a am: 6cd4c57b3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I0e6ce8e2a466105dc11d3d7dff07934930b1c735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 16:09:30 +00:00
Nataniel Borges
6cd4c57b3d Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1 am: a777c5437e am: ef4267d45a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: Iac09671184bf40f6d85623fb617a91b17722c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 15:24:35 +00:00
Nataniel Borges
ef4267d45a Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1 am: a777c5437e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I0100f1b7399ead8bf044238efafa5b9921065bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 14:43:33 +00:00
David Drysdale
b3c2c73235 Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79 am: 5fa61b6df6 am: 59ff4ad69b am: 6bdbc50bf4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: I2ecf3c6faf845c9fb7dd6852f371198515579294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 14:41:10 +00:00
Nataniel Borges
a777c5437e Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I022940e8aff29c92bb6fe9ad13e1a9a5d3aa11ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 13:59:19 +00:00
David Drysdale
6bdbc50bf4 Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79 am: 5fa61b6df6 am: 59ff4ad69b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: Ie224bdfe4fb92f5878dd14b3925dc11c1255e7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 13:54:53 +00:00
David Drysdale
59ff4ad69b Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79 am: 5fa61b6df6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: I6b8e45e2d0cf62bb9ae5a1811b7076cfbf2f1c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 13:17:22 +00:00
Nataniel Borges
579e7baeb1 Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: Ice894d6fbc5d79b384ca5d7d33832f5675df4383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 13:12:19 +00:00
Nataniel Borges
a10ed15f74 Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I26272360eb5856b9f92ab32f584e4ff70e568f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 12:32:57 +00:00
David Drysdale
5fa61b6df6 Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: I5bbde92b1b5c8b4896cfa418200d3608080a4269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 12:31:59 +00:00
David Drysdale
caaedb0a79 Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: I924e9ed30f1768498408961e83040f1ca32401da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 11:42:07 +00:00
Nataniel Borges
d74d81bf6e Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW"
* changes:
  Revert "Only allow cuttlefish to use FCM 9 HALs"
  Revert "Allow fingerprint HAL to be updated via apex in U"
2023-07-06 11:41:24 +00:00
David Drysdale
c67f8ef755 Allow extra ID attestation error codes am: c68dc93788
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791

Change-Id: I67017bfe0d94f2941a910437e2572a043fc345d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 11:03:38 +00:00
Nataniel Borges
7202c60c3a Revert "Only allow cuttlefish to use FCM 9 HALs"
Revert submission 2649121-cm_vintf_workaround

Reason for revert: b/290154726

Reverted changes: /q/submissionid:2649121-cm_vintf_workaround

Change-Id: Ied04c3892a4a00ef75f92e1f89ba38cada2f8293
2023-07-06 10:08:24 +00:00
Nataniel Borges
e42c161bcd Revert "Allow fingerprint HAL to be updated via apex in U"
Revert submission 2649121-cm_vintf_workaround

Reason for revert: b/290154726

Reverted changes: /q/submissionid:2649121-cm_vintf_workaround

Change-Id: I39d65f3a675a3616401411076a4eade403917707
2023-07-06 10:08:24 +00:00
Treehugger Robot
f566028519 Merge "Return INVALID_ ARGUMENTS is the expected result" am: 97af8becd7 am: 5bc5bccb6b am: 3644ef1604 am: 927e1b3bad am: 1b32fe63bd am: 273be36b0c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648139

Change-Id: I7f5aa3cc5414607cafd0585fe79fa21cf809cde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 09:52:37 +00:00
David Drysdale
c68dc93788 Allow extra ID attestation error codes
When deliberately testing invalid ID attestation, use the helper
function (which checks the error return code is correct) in one more
place.

Test: VtsAidlKeyMintTargetTest
Bug: 286733800
Change-Id: I6ea5bd7ee19b3b172330117bfde1b16745debba7
2023-07-06 10:23:55 +01:00
Treehugger Robot
273be36b0c Merge "Return INVALID_ ARGUMENTS is the expected result" am: 97af8becd7 am: 5bc5bccb6b am: 3644ef1604 am: 927e1b3bad am: 1b32fe63bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648139

Change-Id: I095d53181c3f358b408c5b21ee1405bdc13a5d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 09:06:41 +00:00
Treehugger Robot
1b32fe63bd Merge "Return INVALID_ ARGUMENTS is the expected result" am: 97af8becd7 am: 5bc5bccb6b am: 3644ef1604 am: 927e1b3bad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648139

Change-Id: I9604549e84c2febc42a680e6991e8c60b6b5115e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 08:26:39 +00:00
Jooyung Han
6942901f5c Allow face HAL to be updated via apex in U
Bug: 290142180
Test: m check-vintf-all (with -next- pixel targets)
Merged-In: Ia3b15f669219a0941498b90a76b42d5f2f5ac80b
Change-Id: Ia3b15f669219a0941498b90a76b42d5f2f5ac80b
(cherry picked from commit dcd2ae7c29)
2023-07-06 17:13:41 +09:00
Jooyung Han
62f5c13c0a Merge "Allow face HAL to be updated via apex in U" into main 2023-07-06 08:12:06 +00:00
Treehugger Robot
927e1b3bad Merge "Return INVALID_ ARGUMENTS is the expected result" am: 97af8becd7 am: 5bc5bccb6b am: 3644ef1604
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648139

Change-Id: I6eca7a0cdebc7d61eadfc35b94fdb8bd000e2bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 07:41:57 +00:00
Treehugger Robot
3644ef1604 Merge "Return INVALID_ ARGUMENTS is the expected result" am: 97af8becd7 am: 5bc5bccb6b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648139

Change-Id: I042ea7c2a280131237e8cc13aa2cbb01350d348e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 06:54:16 +00:00