Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-03 03:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,442 Commits 4 Branches 0 Tags
a014f4bbd7c581ff7a2af230b96e4e1e3f5bf1ec
Commit Graph

43442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Moreland
a014f4bbd7 [automerger skipped] VehicleManager: use with RefBase am: 0a19e588f0 -s ours am: 4482b06080 -s ours am: bdd1c8e6ae -s ours am: abc540da30 -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 5769163d4b is already in history

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

Change-Id: I0c5ac221d83fa29e67c91e246ba8ec4b6a75ba4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:02:03 +00:00
Steven Moreland
abc540da30 [automerger skipped] VehicleManager: use with RefBase am: 0a19e588f0 -s ours am: 4482b06080 -s ours am: bdd1c8e6ae -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 5769163d4b is already in history

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

Change-Id: Icedcd5da8a5335e5de6032852f9cbd7069f2021f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:36:16 +00:00
Steven Moreland
bdd1c8e6ae [automerger skipped] VehicleManager: use with RefBase am: 0a19e588f0 -s ours am: 4482b06080 -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 5769163d4b is already in history

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

Change-Id: I5c425e290b3433b6a8b835cd0926022f5e9dd7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:10:17 +00:00
Steven Moreland
4482b06080 [automerger skipped] VehicleManager: use with RefBase am: 0a19e588f0 -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 5769163d4b is already in history

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

Change-Id: I3588de177657b1d9b223b4c89fb22bb51c85f90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:48:26 +00:00
Steven Moreland
429138e05f [automerger skipped] VehicleManager: use with RefBase am: 5769163d4b -s ours am: c1b8f7bc8a -s ours am: 112962c9d2 -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 3b8e60afa3 is already in history

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

Change-Id: I13df4f0e447044f7e2b8050e44f7197a28e0bf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:39:59 +00:00
Steven Moreland
112962c9d2 [automerger skipped] VehicleManager: use with RefBase am: 5769163d4b -s ours am: c1b8f7bc8a -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 3b8e60afa3 is already in history

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

Change-Id: I58ef5f12f2c00aaae166aa1d8b77e9483aff298b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:22:51 +00:00
Steven Moreland
c1b8f7bc8a [automerger skipped] VehicleManager: use with RefBase am: 5769163d4b -s ours 
am skip reason: Merged-In Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9 with SHA-1 3b8e60afa3 is already in history

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

Change-Id: I353214c05089f4d3a0527e068d2ab09797cc3f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:03:43 +00:00
Steven Moreland
5769163d4b VehicleManager: use with RefBase 
RefBase with sp<>

Bug: 232557259
Test: build
Merged-In: Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9
Change-Id: Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9
(cherry picked from commit 3b8e60afa3)
 2022-07-19 15:28:08 +00:00
Steven Moreland
0a19e588f0 VehicleManager: use with RefBase 
RefBase with sp<>

Bug: 232557259
Test: build
Change-Id: Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9
Merged-In: Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9
 2022-07-19 15:04:46 +00:00
TreeHugger Robot
da1e1a485a Merge "Fixed VEHICLE_CURB_WEIGHT property" into tm-qpr-dev am: cc4486f974 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19246629

Change-Id: I777db90e76d443fda47dd44a3a93fba265af8f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 02:38:32 +00:00
TreeHugger Robot
cc4486f974 Merge "Fixed VEHICLE_CURB_WEIGHT property" into tm-qpr-dev 2022-07-19 02:20:05 +00:00
TreeHugger Robot
8ea510f379 [automerger skipped] Merge "Supoort audio configuration update to audio HAL for broadcast offload" into tm-qpr-dev am: 60b03fb52f -s ours 
am skip reason: Merged-In Iadae625d10ad179089b952ac94ff66ae90a6236e with SHA-1 36a879796b is already in history

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

Change-Id: I28c85c839b8b0cc9540f7511e740fb1a9e10f24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 22:23:18 +00:00
Alice Kuo
3172943820 [automerger skipped] Supoort audio configuration update to audio HAL for broadcast offload am: 53c6e83534 -s ours 
am skip reason: Merged-In Iadae625d10ad179089b952ac94ff66ae90a6236e with SHA-1 36a879796b is already in history

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

Change-Id: I6929e5d81bad2afc0d292335d4e39277ecefe561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 22:23:16 +00:00
TreeHugger Robot
60b03fb52f Merge "Supoort audio configuration update to audio HAL for broadcast offload" into tm-qpr-dev 2022-07-18 22:01:46 +00:00
Tyler Trephan
e64787b3e7 Merge "Added FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME" into tm-qpr-dev am: 0f36c8aef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19213677

Change-Id: Ib072b017aaeff79fce6a63e75ed92441f07ddc70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 20:57:58 +00:00
Tyler Trephan
0f36c8aef4 Merge "Added FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME" into tm-qpr-dev 2022-07-18 20:51:47 +00:00
Steven Moreland
20405515a2 VehicleManager: use with RefBase am: 3b8e60afa3 am: 7a96e33640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19300534

Change-Id: I3b795177938a388719a4d2942f5a15b1ce38dcca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:41:02 +00:00
Steven Moreland
7a96e33640 VehicleManager: use with RefBase am: 3b8e60afa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19300534

Change-Id: Ic3bd05a3fe40fbfa8cc8d0e1b81fa50c15d887de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:15:01 +00:00
Steven Moreland
3b8e60afa3 VehicleManager: use with RefBase 
RefBase with sp<>

Bug: 232557259
Test: build
Change-Id: Id6b3b7e222980fd0e82b2d94ff2518e92d42a4d9
 2022-07-15 22:55:13 +00:00
David Drysdale
5ae9bcd18a Merge "KeyMint HAL: clarify leaf cert requirements" am: 824c5d8f60 am: ac42d60136 am: a25bb1ce67 am: 7cda119c94 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2154073

Change-Id: I4516fbb5a36d8446b39ed7a574333e8969936fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 15:05:31 +00:00
David Drysdale
7cda119c94 Merge "KeyMint HAL: clarify leaf cert requirements" am: 824c5d8f60 am: ac42d60136 am: a25bb1ce67 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2154073

Change-Id: I840adcb60f174f8538667e4ab9e570eea2f67b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 14:51:01 +00:00
David Drysdale
a25bb1ce67 Merge "KeyMint HAL: clarify leaf cert requirements" am: 824c5d8f60 am: ac42d60136 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2154073

Change-Id: I953b8bc539caf13d4d08430c8a57989ca7a9e957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 14:23:44 +00:00
David Drysdale
ac42d60136 Merge "KeyMint HAL: clarify leaf cert requirements" am: 824c5d8f60 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2154073

Change-Id: Iaf833a5d576accb0fa104ce0e235e1c96b33c398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 14:01:23 +00:00
David Drysdale
824c5d8f60 Merge "KeyMint HAL: clarify leaf cert requirements" 2022-07-15 13:37:19 +00:00
David Drysdale
9f7fcb826b Merge "KeyMint: Test size requirements for ciphers" am: 96ed41b2e2 am: 26fd684e20 am: 97fba23c6e am: 3b0cc537d8 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147675

Change-Id: Ibb28efd0ee455cc0599a2790452f1675257ecc09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 13:26:17 +00:00
David Drysdale
3b0cc537d8 Merge "KeyMint: Test size requirements for ciphers" am: 96ed41b2e2 am: 26fd684e20 am: 97fba23c6e 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147675

Change-Id: I7c5e429a5d2b929a02f3aa7fea1f0c7fdf098d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 13:09:43 +00:00
David Drysdale
97fba23c6e Merge "KeyMint: Test size requirements for ciphers" am: 96ed41b2e2 am: 26fd684e20 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147675

Change-Id: I73134b013a3fa5862eec185367c3271afb6b804f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 12:51:09 +00:00
David Drysdale
26fd684e20 Merge "KeyMint: Test size requirements for ciphers" am: 96ed41b2e2 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147675

Change-Id: I029f366281a868e0f92173a6f71afe8fe846adf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 12:28:23 +00:00
David Drysdale
96ed41b2e2 Merge "KeyMint: Test size requirements for ciphers" 2022-07-15 12:10:10 +00:00
Gabriel Biren
3c1e51ebd3 Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe39266 am: c75dd7f4bb am: f657125ec7 am: 35d8198274 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078202

Change-Id: I04dc5c4edf40cc7674519edc9fa58de53ae34158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 17:30:52 +00:00
Gabriel Biren
35d8198274 Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe39266 am: c75dd7f4bb am: f657125ec7 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078202

Change-Id: I2286ee895fdf43b32757de39eadaf7909b406c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 17:13:38 +00:00
Gabriel Biren
f657125ec7 Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe39266 am: c75dd7f4bb 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078202

Change-Id: Id2bec9f13934b1064c23932774786d6cfba1750c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 16:47:18 +00:00
David Drysdale
9daf7c70a8 KeyMint HAL: clarify leaf cert requirements 
Bug: 237624131
Bug: 238037309
Test: None, comment change
Change-Id: I7426deda8b0735f1ca34a22fc21ec0121a0fcca8
 2022-07-14 17:39:42 +01:00
Gabriel Biren
c75dd7f4bb Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe39266 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078202

Change-Id: Icf2fb7abdd0cb0fe825e70ea03fcd51686bf2c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 16:27:09 +00:00
Gabriel Biren
1bdfe39266 Merge "Add WiFi Vendor HAL AIDL interface definitions." 2022-07-14 16:10:58 +00:00
Alice Kuo
53c6e83534 Supoort audio configuration update to audio HAL for broadcast offload 
Bug: 210987580
Test: start the broadcast offload, check log
Change-Id: Iadae625d10ad179089b952ac94ff66ae90a6236e
Merged-In: Iadae625d10ad179089b952ac94ff66ae90a6236e
(cherry picked from commit 36a879796b)
 2022-07-14 19:04:02 +08:00
Prashant Patil
dd5f7f0e8d KeyMint: Test size requirements for ciphers 
Test size requirements for symmetric (Stream and Block) ciphers.
These tests are similar to CTS tests of symmetric ciphers.
For reference CTS test BlockCipherTestBase#testKatEncryptOneByteAtATime
for all its derived classes eg. AES128CBCNoPaddingCipherTest,
AES128CBCPKCS7PaddingCipherTest etc.

Bug: 226899425
Test: run vts -m VtsAidlKeyMintTargetTest

Change-Id: I78408071fbf5a360d89c5bbae479faffd7c6d935
 2022-07-13 12:36:22 +00:00
Alice Kuo
184801b5b7 [automerger skipped] Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: bd915c129c -s ours 
am skip reason: Merged-In I60b1b506051873f6d942f2febace6562634fc12a with SHA-1 ee398a93f5 is already in history

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

Change-Id: I806afb6eeebd12c9dce81989a90ec28c42b00ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:52:27 +00:00
Alice Kuo
4afff852c8 Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: ee398a93f5 am: fb6b495535 am: 55503bbf08 am: d1624b7724 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147741

Change-Id: I04cfd9deafff2fd6fa9cebfab3633f8b142a6019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 06:09:10 +00:00
Alice Kuo
d1624b7724 Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: ee398a93f5 am: fb6b495535 am: 55503bbf08 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147741

Change-Id: I76eaa9399b08ef721d89d2d01e156841b47cb309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 05:54:35 +00:00
Alice Kuo
55503bbf08 Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: ee398a93f5 am: fb6b495535 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147741

Change-Id: I11ccc699886d36091e343ed7f54841da09a8cc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 05:37:02 +00:00
Alice Kuo
fb6b495535 Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: ee398a93f5 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147741

Change-Id: I913250b6070b9d16bd03669c7fe078ea6c5bcbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 05:20:27 +00:00
Alice Kuo
bd915c129c Bluetooth audio hal check broadcast configuraiton for the broadcast offload 
The patch contains the following changes
1. Check the broadcast audio configuration as starting broadcast offload
   session
2. Update audio configuration checker for broadcast offload
3. Remove the IsOffloadLeAudioConfigurationValid function that the audio
   configuraiton is invalid as session started, so we don't need to
   check it at that time

Bug: 210987580
Test: start the offload broadcast stream, and check the session status
Change-Id: I60b1b506051873f6d942f2febace6562634fc12a
Merged-In: I60b1b506051873f6d942f2febace6562634fc12a
(cherry picked from commit ee398a93f5)
 2022-07-13 12:40:26 +08:00
Alice Kuo
ee398a93f5 Bluetooth audio hal check broadcast configuraiton for the broadcast offload 
The patch contains the following changes
1. Check the broadcast audio configuration as starting broadcast offload
   session
2. Update audio configuration checker for broadcast offload
3. Remove the IsOffloadLeAudioConfigurationValid function that the audio
   configuraiton is invalid as session started, so we don't need to
   check it at that time

Bug: 210987580
Test: start the offload broadcast stream, and check the session status
Change-Id: I60b1b506051873f6d942f2febace6562634fc12a
 2022-07-13 04:39:00 +00:00
Xin Li
4a2dac4f5e [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 035ee7b933 -s ours am: 8214478d3b -s ours am: a21a5a69de -s ours 
am skip reason: Merged-In I25e8f827645db8e83c8c3142f5e76a912fdf7b22 with SHA-1 6973e79b91 is already in history

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

Change-Id: I83eb28d5f032b132c88bb4722fdc9ec7541e34e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 02:22:38 +00:00
Xin Li
a21a5a69de [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 035ee7b933 -s ours am: 8214478d3b -s ours 
am skip reason: Merged-In I25e8f827645db8e83c8c3142f5e76a912fdf7b22 with SHA-1 6973e79b91 is already in history

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

Change-Id: Ib15fb09ba9e8e73d4db0bd219fbf3c6b70d4ff0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 01:59:50 +00:00
Xin Li
8214478d3b [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 035ee7b933 -s ours 
am skip reason: Merged-In I25e8f827645db8e83c8c3142f5e76a912fdf7b22 with SHA-1 6973e79b91 is already in history

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

Change-Id: I87c6429520b4785fcb2e24aa40a2903dd4d54b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 01:30:11 +00:00
Les Lee
8895a4f9a8 [automerger skipped] Merge "wifi: create interface before running hostapd vts" into stage-aosp-tm-ts-dev am: 73e015a761 am: 375cf6a784 -s ours am: e8085118ce -s ours am: 694fae9121 -s ours 
am skip reason: Merged-In I483671cb01b68bc6f5ac4840c61b10f4c31f10e4 with SHA-1 42147b7b5b is already in history

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

Change-Id: I7de1267fd2871a3322ff461f0827bbe11cdefac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:48:56 +00:00
Les Lee
ed679c3259 [automerger skipped] Merge "wifi: create interface before running hostapd vts" into stage-aosp-tm-ts-dev am: 73e015a761 am: 375cf6a784 am: c6ccc282f0 -s ours am: 08b3869ce4 -s ours 
am skip reason: Merged-In I483671cb01b68bc6f5ac4840c61b10f4c31f10e4 with SHA-1 42147b7b5b is already in history

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

Change-Id: Ia5b844a372748412a2655c2197a55f28b97cc800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:48:41 +00:00
Xin Li
035ee7b933 DO NOT MERGE - Merge TP1A.220624.013 
Merged-In: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
Change-Id: Iabfc2e451749cbfe858e7bca6492565bf020d878
 2022-07-11 21:47:42 -07:00