Commit Graph

53800 Commits

Author SHA1 Message Date
Jaideep Sharma
dfd1d0632e vts: getParameters only if parameters are supported
1) Validate specific parameters before open call,
   send only if parameters are supported.
2) GetParameters only if parameters are in range.

Bug: 288510312
Test: run vts VtsHalNSTargetTest, VtsHalAECTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:b985903e16929a7378c6c8ff6281e6748164ce51)
Merged-In: Idb20d819b3eb8a4ba56b4d50311c1aa7659f3616
Change-Id: Idb20d819b3eb8a4ba56b4d50311c1aa7659f3616
2023-07-18 01:03:34 +00:00
Jeff Pu
750c778f60 Merge "Update fingerprint VHAL operation lifecycle" into udc-qpr-dev 2023-07-17 15:40:25 +00:00
Jeff Pu
073af1802e Update fingerprint VHAL operation lifecycle
Bug: 289410175
Test: atest FakeFingerprintEngineTest
Change-Id: I6da68047be9bf5357c1b4c75ba28fc66c2e3bcc0
2023-07-17 13:23:47 +00:00
Gabriel Biren
b99ff556f2 Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0 am: f479d8837b am: 065901cf4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24060409

Change-Id: Ib2e6dd0f22fe51ecb51d2ba05efc202b30cd73ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:03:03 +00:00
Gabriel Biren
065901cf4d Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0 am: f479d8837b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24060409

Change-Id: Ie655498707b4c3b3ad84652804f5a573359ef8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:14:14 +00:00
Gabriel Biren
f479d8837b Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24060409

Change-Id: I0deb0bdd1825027a80ab90dcbf9fe8e633effe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:05:54 +00:00
Gabriel Biren
e410f8ccc0 Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev 2023-07-14 20:06:21 +00:00
Yusuke Yoshimura
42c050de92 Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61afb am: 8cae7cb490 am: 3e20b3b749
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23899247

Change-Id: I37a476ebec9980827439951f4c76d1225f2346f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 08:35:34 +00:00
Yusuke Yoshimura
3e20b3b749 Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61afb am: 8cae7cb490
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23899247

Change-Id: Ic3fc0b65bb565f6e7bda5b22973da6c034ab8b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 07:50:47 +00:00
Yusuke Yoshimura
8cae7cb490 Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61afb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23899247

Change-Id: I433a9bed154bc0cbabf758ab2efde6fef43e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 07:05:54 +00:00
Yusuke Yoshimura
bc88f61afb Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev 2023-07-14 06:25:50 +00:00
Gabriel Biren
140534a783 Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev 2023-07-13 20:58:29 +00:00
Gabriel Biren
4c3eeb417e Use a 64-bit instance of 0x1 when creating
the event bitmask.

Comments on ag/24025770 suggest that the bit
shift will lead to undefined behavior for
event codes greater than 31.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
       # manually set some of the expected
       # events codes to > 31 to verify that
       # the bit shift works as expected
Change-Id: I09e11dac8acf90baf047e24cebe1d01970b1dc8a
2023-07-13 19:46:59 +00:00
Gabriel Biren
1f06b4bf76 Use a 64-bit instance of 0x1 when creating
the event bitmask.

Comments on ag/24025770 suggest that the bit
shift will lead to undefined behavior for
event codes greater than 31.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
       # manually set some of the expected
       # events codes to > 31 to verify that
       # the bit shift works as expected
Change-Id: I09e11dac8acf90baf047e24cebe1d01970b1dc8a
2023-07-13 18:24:14 +00:00
David Drysdale
de786e8670 [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: 90efd06353 am: bc7ba70669 -s ours am: 5a7bc3352c -s ours am: 03a347b2f4 -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: Ib0554daa1b8b64947c0149ac7e7fbc2df7bb2b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 11:04:59 +00:00
David Drysdale
03a347b2f4 [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: 90efd06353 am: bc7ba70669 -s ours am: 5a7bc3352c -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: Ib1691c963a4622da484711073f6c564eda573b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 10:22:53 +00:00
David Drysdale
a516e858c2 [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: e4cc51fe87 -s ours am: d1cbfe8772 -s ours am: 234b4d2d27 -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: I05afa7135011fb87acefa8950dabe8eebea558c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:41:29 +00:00
David Drysdale
ae09bdab0f Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 am: 6c38c03f19 am: af1ebb6250
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I32116bf246c38b301f75302372ec8693a3cb4e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:41:07 +00:00
David Drysdale
5a7bc3352c [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: 90efd06353 am: bc7ba70669 -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: I630c9dea68ff139e40502a47355311d4eda1e3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:40:45 +00:00
David Drysdale
bc7ba70669 Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: 90efd06353
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I4565bc9ccf0357378dd616220db00681d4811fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:02:09 +00:00
David Drysdale
234b4d2d27 [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: e4cc51fe87 -s ours am: d1cbfe8772 -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: I440fdd86f60066e2df7ed4131c2eda3a89983b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:01:20 +00:00
David Drysdale
af1ebb6250 Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 am: 6c38c03f19
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I143e239298196586c950bbab21f2ff70a57ffd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 09:01:05 +00:00
David Drysdale
d1cbfe8772 [automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: e4cc51fe87 -s ours
am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

Change-Id: I2e497c32b24d522a95300b93ed47f44174bc4cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 08:59:14 +00:00
David Drysdale
90efd06353 Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: Iebb6a2553b518d21af389da729ebd2cc6266674c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:59:32 +00:00
David Drysdale
6c38c03f19 Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: Ifdfb32ac272362704390c750b1fd50c4d99c21d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:59:09 +00:00
David Drysdale
e4cc51fe87 Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I9a2c1cb8d89525dfce2d9ca55e7bf51bc0ce6cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:58:38 +00:00
David Drysdale
4a70416566 Allow extra ID attestation error codes am: 3f6ab601b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I50cb0d0bcbc65034315fef54ef5b772fb6d3d38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:15:02 +00:00
David Drysdale
b37f07acc2 Allow extra ID attestation error codes am: 3f6ab601b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I587cf99dc8621900889034503238ffdb94f2bda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:10:47 +00:00
Treehugger Robot
b41fbbdbec Merge "BluetoothAudio: Statically link HAL dependencies" into stage-aosp-udc-ts-dev am: e6da8fb752 am: 99e5913e0a am: d8e7fa4e03
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24039765

Change-Id: I192b91378f6aed60e771d34c8a762e3e06595335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 01:18:16 +00:00
Treehugger Robot
d8e7fa4e03 Merge "BluetoothAudio: Statically link HAL dependencies" into stage-aosp-udc-ts-dev am: e6da8fb752 am: 99e5913e0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24039765

Change-Id: I42b5155172f95cc1ab120a20e59201dd05fcd450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 00:36:31 +00:00
Treehugger Robot
99e5913e0a Merge "BluetoothAudio: Statically link HAL dependencies" into stage-aosp-udc-ts-dev am: e6da8fb752
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24039765

Change-Id: I849ddf0b682943fb1f33acd055ad76ac5e6fa7bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 23:51:18 +00:00
Treehugger Robot
09681ab0bf [automerger skipped] Merge "Strongbox may not support 1024 bit key size for RSA." into stage-aosp-udc-ts-dev am: fcabe78a65 am: 051d4535a7 am: d8eb287445 -s ours
am skip reason: Merged-In I32bb28001aca9b69eedb1bd3d0bcff43052d06e4 with SHA-1 9d1d8b7327 is already in history

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

Change-Id: If5401e78984af827a3fe3423eae816f8f268a3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 23:02:47 +00:00
Treehugger Robot
e6da8fb752 Merge "BluetoothAudio: Statically link HAL dependencies" into stage-aosp-udc-ts-dev 2023-07-12 22:57:11 +00:00
Treehugger Robot
d8eb287445 Merge "Strongbox may not support 1024 bit key size for RSA." into stage-aosp-udc-ts-dev am: fcabe78a65 am: 051d4535a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23895311

Change-Id: If16ad2a6edd102c6b3d7ddbd640fe8c97cef8aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 22:17:04 +00:00
Treehugger Robot
051d4535a7 Merge "Strongbox may not support 1024 bit key size for RSA." into stage-aosp-udc-ts-dev am: fcabe78a65
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23895311

Change-Id: I66aec36a051276d8f8a6f3147245979a2fd79b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 21:31:45 +00:00
Treehugger Robot
fcabe78a65 Merge "Strongbox may not support 1024 bit key size for RSA." into stage-aosp-udc-ts-dev 2023-07-12 20:40:47 +00:00
Myles Watson
5aadf9ad17 BluetoothAudio: Statically link HAL dependencies
Bug: 290666670
Bug: 289857524
Bug: 284091286
Bug: 289489060
Test: mma -j32
(cherry picked from https://android-review.googlesource.com/q/commit:44628f38d2f60a8e9c283315485d2d62605f677d)
Merged-In: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
Change-Id: I2b3c32b133e208ec2cfb1b244ccb24ad249f22df
The 32-bit libraries may not be present on the device.  This makes the test more self-contained.
2023-07-12 17:07:14 +00:00
David Drysdale
3f6ab601b9 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
(cherry-picked from commit c68dc93788)
Merged-In: I6ea5bd7ee19b3b172330117bfde1b16745debba7
2023-07-12 13:58:41 +00:00
David Drysdale
2e49ba2b93 Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09b7 am: fd246a3aac am: bb32140afc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23896032

Change-Id: I1098f196e0e3c779f67adde64b2b60741e2dd378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 11:41:12 +00:00
David Drysdale
47df38dc74 Allow extra error code in device ID attestation am: 94042a987c am: 7a46f5c9aa am: 6d11e19f39
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23916423

Change-Id: I9b2c5c642257ea6373b62a83b8594a0244962b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 11:41:08 +00:00
David Drysdale
bb32140afc Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09b7 am: fd246a3aac
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23896032

Change-Id: I9a8dea0b8ad4b6a7b63a7202835c475090e59e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 10:59:44 +00:00
David Drysdale
6d11e19f39 Allow extra error code in device ID attestation am: 94042a987c am: 7a46f5c9aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23916423

Change-Id: I798b1cd0d4598a0395cd0a53d73e8dec0adba59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 10:59:41 +00:00
David Drysdale
fd246a3aac Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23896032

Change-Id: Iea251431c60cf26f079aca38fe7727d60c74b606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 10:18:46 +00:00
David Drysdale
7a46f5c9aa Allow extra error code in device ID attestation am: 94042a987c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23916423

Change-Id: Iab873fac8b3c21fe3d7aa9d6bf4e6c822e02fc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 10:18:43 +00:00
David Drysdale
85105d09b7 Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev
* changes:
  Fix attestation error checks
  Allow extra error code in device ID attestation
2023-07-12 09:31:43 +00:00
liuxiangjun
b79f1d118c [automerger skipped] Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 84065ce938 am: 5be5458be5 am: 04923c7651 -s ours am: 9312b9ef41 -s ours am: 7795e72e70 -s ours
am skip reason: Merged-In I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40 with SHA-1 7ddd478150 is already in history

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

Change-Id: I48cb6db9aff9a2219f249480d5df5d1c12f82353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 06:44:51 +00:00
liuxiangjun
7795e72e70 [automerger skipped] Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 84065ce938 am: 5be5458be5 am: 04923c7651 -s ours am: 9312b9ef41 -s ours
am skip reason: Merged-In I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40 with SHA-1 7ddd478150 is already in history

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

Change-Id: Ic425cb2789d7fd8e9a17a7abf72d36e35c3e3eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 06:03:03 +00:00
liuxiangjun
3a83a5c6b3 [automerger skipped] Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 84065ce938 am: 060cb55a52 -s ours am: 734c36afa8 -s ours am: 27fb4bc41a -s ours
am skip reason: Merged-In I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40 with SHA-1 7ddd478150 is already in history

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

Change-Id: If8935cece63ccec8424aab49c959bd77e9d0dd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 05:19:00 +00:00
liuxiangjun
0d50cc19cb Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 1d611fec5f am: 166b959d21 am: 29ea23a41c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648141

Change-Id: Ifdbfd5e796ee09b4cb901ef4c88f407640c7ef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 05:18:54 +00:00
liuxiangjun
9312b9ef41 [automerger skipped] Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 84065ce938 am: 5be5458be5 am: 04923c7651 -s ours
am skip reason: Merged-In I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40 with SHA-1 7ddd478150 is already in history

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

Change-Id: Ifb897050577dd5a5a21e2708377d57ebd7ba57e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 05:18:26 +00:00