Commit graph

32122 commits

Author SHA1 Message Date
Ilya Matyukhin
9208a09568 IFace: fix default implementation to pass VTS
Bug: 193849101
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: Ia90c639074a6a9ed270f7c499c8816a8c7224b7f
2021-07-21 23:13:43 +00:00
Ilya Matyukhin
61a6d8d72e IFace: fix VTS test to match the interface contract
Bug: 193849101
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: I5b3ed1b87244d6265d23c15ef2c2efe4f6155973
2021-07-21 23:12:17 +00:00
TreeHugger Robot
997554db63 Merge "Audio VTS: Make the active microphone query test more robust in V7" into sc-dev 2021-07-20 16:52:02 +00:00
David Li
183f6190a8 Merge "audio: make sure to set back to AudioMode::NORMAL after the test case" into sc-dev 2021-07-20 08:20:47 +00:00
Mikhail Naganov
e4ce86bfb7 Audio VTS: Make the active microphone query test more robust in V7
Prior to V7 the test which exercises
IStreamIn.getActiveMicrophones was using a hardcoded
configuration for the input stream. This configuration no longer
works for some of new devices. To fix that, the part of the test
which calls getActiveMicrophones has been moved into a separate
test--a descendant of InputStreamTest which is parametrized
using the actual configuration of the DUT.

Tests for HAL versions prior to V7 are not affected
because they don't use a full parser for the DUT config.

Bug: 193849687
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I00fe8fedb6bfc6e034387b35c88f954cb2638dfa
2021-07-19 23:04:15 +00:00
David Li
238fbcc61a audio: make sure to set back to AudioMode::NORMAL after the test case
If the major version is greater than or equal to 6, the test tries
to set the mode to AudioMode::CALL_SCREEN. However, it doesn't set
back to AudioMode::NORMAL. Replace all ASSERT with EXPECT to ensure the
test can reach to the explicit call to reset to AudioMode::NORMAL.

Bug: 194022995
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: Ib9b6e310965a85b016853b72c60716fa054641c6
2021-07-19 16:26:42 +08:00
Kalesh Singh
78fb95c57f Merge "Memtrack HAL: Report global total GPU-private memory" into sc-dev 2021-07-15 17:21:49 +00:00
Kalesh Singh
eeac52c8f1 Memtrack HAL: Report global total GPU-private memory
Update memtrack hal documentation to allow reporting the global
total GPU-private memory from the getMemory() API.

Specify how to handle unsupported memtrack operations.

Bug: 193226716
Bug: 193465681
Bug: 192621117
Test: N/A
Change-Id: I6fcebd16fafdc34cc662137784e86750ee907eee
2021-07-14 21:15:46 +00:00
TreeHugger Robot
afb4bfa127 Merge "Update vibrator VTS to only validate support from required primitives" into sc-dev 2021-07-14 16:14:17 +00:00
Jayant Chowdhary
b4d21c8e80 Merge "camera: Clarify that ANDROID_JPEG_MAX_SIZE applies to default sensor pixel mode." into sc-dev 2021-07-13 23:22:55 +00:00
Mikhail Naganov
4e2a9b4e7b [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours am: 06f896205f -s ours am: 38565fed01 -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: I3f0be31f10d37bb02cbd9dbdde305fce8c17eb2f
2021-07-13 22:50:04 +00:00
Mikhail Naganov
021f8b3d25 [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours am: f95892e056 -s ours am: 693ef009de -s ours am: 582762856b -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Icb9fc63189bdcd4da6b21945a6d44a0af3129303
2021-07-13 22:47:09 +00:00
Edwin Wong
6a8cf103f1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours am: ea107f75ac -s ours am: ea7913adf1 -s ours am: 8200116264 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c750160a3d3d380d1a4c838f1e66398d5d5f12a
2021-07-13 22:47:04 +00:00
Edwin Wong
05d7544450 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours am: 08cc801065 -s ours am: 0d39675734 -s ours am: e27f543b7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00f70d4d37cac5d0180d993280e6e2c670fc10fc
2021-07-13 22:46:32 +00:00
Edwin Wong
cc68e65325 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours am: a6825483b4 -s ours am: cee994fd5c -s ours am: 12703b3ac1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3569001af2678d88481ec07fa909a6e8dd9a9ab7
2021-07-13 22:36:53 +00:00
Edwin Wong
f69e34fa04 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours am: bc0c22c343 -s ours am: 6c942475ba -s ours am: 32cad96ae5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9657a39d922f0f023e85b6c295a50dc969c8a041
2021-07-13 22:33:20 +00:00
Mikhail Naganov
33e304782a [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours am: 06f896205f -s ours am: 4dd47f50c1 -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: I85f34dbaa53e8d34dfe01ca2c804de94bb6e8c84
2021-07-13 22:29:35 +00:00
Mikhail Naganov
2df535ab12 [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours am: f95892e056 -s ours am: 693ef009de -s ours am: 80a32475e3 -s ours
am skip reason: skipped by user smoreland

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

Change-Id: If49a26f3000863644d0e91b94c357c67416b1a7c
2021-07-13 22:29:29 +00:00
Edwin Wong
0916c1b8b2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours am: ea107f75ac -s ours am: ea7913adf1 -s ours am: 814a34003d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I306dbee8ccfd47f98b6526766bf62913d4d627c2
2021-07-13 22:29:21 +00:00
Edwin Wong
9584ef12b8 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours am: 08cc801065 -s ours am: 0d39675734 -s ours am: a19de5a59f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb6330c5f09071bea940beeeed758f98da9514c9
2021-07-13 22:29:13 +00:00
Edwin Wong
06d20864f4 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours am: a6825483b4 -s ours am: cee994fd5c -s ours am: 402a0d9e6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2cee1cbb5e2a3596271ed965dcc9c4bf2ed0d31
2021-07-13 22:28:49 +00:00
Edwin Wong
0e85ec7532 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours am: bc0c22c343 -s ours am: 6c942475ba -s ours am: 2bbbc56712 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04de5a53d392d688aae439279ff3800c9c605dbc
2021-07-13 22:28:41 +00:00
Mikhail Naganov
38565fed01 [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours am: 06f896205f -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: Ibf4600f822f99d1b773c90bd0144c6243510c4d7
2021-07-13 22:17:59 +00:00
Mikhail Naganov
582762856b [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours am: f95892e056 -s ours am: 693ef009de -s ours
am skip reason: skipped by user smoreland

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

Change-Id: I65d55b421528b2c9958ec4070d4f13542cb48982
2021-07-13 22:17:52 +00:00
Mikhail Naganov
4dd47f50c1 [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours am: 06f896205f -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: Ic0c373db6bc88a2e6e3eae4fda397ba5c2de046e
2021-07-13 22:17:52 +00:00
Mikhail Naganov
80a32475e3 [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours am: f95892e056 -s ours am: 693ef009de -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Ic4e39cfb299f653ac37bbada7b4f284f5d0f6034
2021-07-13 22:17:47 +00:00
Edwin Wong
8200116264 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours am: ea107f75ac -s ours am: ea7913adf1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a9338069e49a3e2c90c5ca66fc3bdfdee746a35
2021-07-13 22:17:45 +00:00
Edwin Wong
814a34003d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours am: ea107f75ac -s ours am: ea7913adf1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f9fbedca9cc7ae0cb193dd798f48c04a1389a06
2021-07-13 22:17:42 +00:00
Edwin Wong
e27f543b7a [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours am: 08cc801065 -s ours am: 0d39675734 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4c20f5f823d27181094834382d56e1743d79122
2021-07-13 22:17:38 +00:00
Edwin Wong
a19de5a59f [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours am: 08cc801065 -s ours am: 0d39675734 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a3c37b73625134c1bbbcfb5b624420b28b8f25f
2021-07-13 22:17:34 +00:00
Edwin Wong
12703b3ac1 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours am: a6825483b4 -s ours am: cee994fd5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I208c8432d9c5605457dfe826003f9f90f12c78f9
2021-07-13 22:17:18 +00:00
Edwin Wong
402a0d9e6d [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours am: a6825483b4 -s ours am: cee994fd5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfa77d751bbbb184033a37897c2bc1cc971757c7
2021-07-13 22:17:15 +00:00
Edwin Wong
32cad96ae5 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours am: bc0c22c343 -s ours am: 6c942475ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae6139f4498844e5c03f9cc379e20f9421078475
2021-07-13 22:17:11 +00:00
Edwin Wong
2bbbc56712 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours am: bc0c22c343 -s ours am: 6c942475ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6de7dc34d951e5d6b05dc77757d5911a64ba88d4
2021-07-13 22:17:08 +00:00
Mikhail Naganov
06f896205f [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours am: 290e356e20 -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: I2e1d5527f97d70717aa3c2ae8cae04ee94832ccd
2021-07-13 22:04:03 +00:00
Mikhail Naganov
693ef009de [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours am: f95892e056 -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Ibb4ce9d31f77a0c787396769efcc52b195598f76
2021-07-13 22:03:57 +00:00
Edwin Wong
ea7913adf1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours am: ea107f75ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife7e2496a5b8fb42e3e1edcf1734572c8a94573b
2021-07-13 22:03:50 +00:00
Edwin Wong
0d39675734 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours am: 08cc801065 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie69da8eddaaee528add1003c69d2e6806923567f
2021-07-13 22:03:42 +00:00
Edwin Wong
cee994fd5c [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours am: a6825483b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6a41288cfe5fd004d1e2439a73baaf6f97cb993
2021-07-13 22:03:21 +00:00
Edwin Wong
6c942475ba [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours am: bc0c22c343 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I481b343e5889cddc535c36a28c310f35e2cd4a89
2021-07-13 22:03:13 +00:00
Mikhail Naganov
290e356e20 [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours am: 2b04128539 -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: I911fb5753e414aa6ddafc5ac69b561617b52f490
2021-07-13 21:45:27 +00:00
Mikhail Naganov
f95892e056 [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours am: d1a8e6c2ab -s ours
am skip reason: skipped by user smoreland

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

Change-Id: I154915eabab0171687bd1e36834c5183e59f2500
2021-07-13 21:45:22 +00:00
Edwin Wong
ea107f75ac [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours am: 79754b8dbb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e4b4ad6b8013ff2bfe5866c080a7949f06466ce
2021-07-13 21:45:18 +00:00
Edwin Wong
08cc801065 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours am: 2d3819de76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bd1a89ca80696ccbe951b8c61d95d62fd2e82bb
2021-07-13 21:45:12 +00:00
Edwin Wong
a6825483b4 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14 -s ours am: ef66293e9a -s ours am: 932ee80a22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6800bbc7f642a91456368601afa0ddc3270d342
2021-07-13 21:44:59 +00:00
Edwin Wong
bc0c22c343 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835 -s ours am: e17031023f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I957226dd902bd82def0d6498abc1cf5e5c5818dd
2021-07-13 21:44:50 +00:00
Mikhail Naganov
2b04128539 [automerger skipped] audio HAL - fix UAFs am: 9f6d6ae26c -s ours
am skip reason: Merged-In I5ec70b098a00746108e10ab39e966607d78c84ae with SHA-1 bd78085f08 is already in history

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

Change-Id: I84ba3062f5b2fd4ec269c28b7e637b4f6de30942
2021-07-13 21:29:17 +00:00
Mikhail Naganov
d1a8e6c2ab [automerger skipped] audio HAL - fix UAFs am: bd78085f08 -s ours am: 358f0174a5 -s ours
am skip reason: skipped by user smoreland

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

Change-Id: Iee0d7f34fb8759f194b4057c409b612e61349572
2021-07-13 21:29:02 +00:00
Edwin Wong
79754b8dbb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f -s ours am: 583a32b6c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I329f92aac86f973e06d6dc708bad7eb68091d0b0
2021-07-13 21:28:58 +00:00
Edwin Wong
2d3819de76 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc9ffef15dcc042b09ffbe4802924f5513956acb
2021-07-13 21:28:53 +00:00