summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-23Merge cherrypicks of ['googleplex-android-review.googlesource.com/22465455'] ↵android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android12L-platform-releaseAndroid Build Coastguard Worker
into sc-v2-platform-release. Change-Id: I365e4101295c2e30b69a2d54162854fb0abee740
2023-10-23Add AppOps overload to be able to watch foreground changes.Evan Severson
We have never offered the native API to register mode watchers that are invoked for foregroundness changes when the raw mode is MODE_FOREGROUND. Test: Add logging to verify invocation Bug: 247768581 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:949cb3d098fd98715826fc92ea3c26a51aa2d976) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:130ff33dfeb3c0702636db090399f114fde86174) Merged-In: I89af46de557fbfc31d69613367a4e26a5222430a Change-Id: I89af46de557fbfc31d69613367a4e26a5222430a
2023-08-11Merge cherrypicks of ['googleplex-android-review.googlesource.com/23905808'] ↵android-platform-12.1.0_r21android-platform-12.1.0_r20Android Build Coastguard Worker
into sc-v2-platform-release. Change-Id: I7bdc15365fa8f285cdf96283a59188ee0015d753
2023-08-11Fix for heap-use-after-free in GPUService.cppsergiuferentz
This adds a unit test and fix for the bug reported by libfuzzer. Changes made: * Expose GPUService as testable code. * Update main_gpuservice.cpp to use the new GpuService now located at gpuservice/GpuService.h * Make initializer threads members of GpuService * Join the threads in destructor to prevent heap-use-after-free. * Add unit test that waits 3 seconds after deallocation to ensure no wrong access is made. Bug: 282919145 Test: Added unit test and ran on device with ASAN (cherry picked from commit 3c00cbc0f119c3f59325aa6d5061529feb58462b) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:24a7874bb4093a1a6721a2002569512c43af5bdc) Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029
2023-07-17Merge cherrypicks of ['googleplex-android-review.googlesource.com/23677152'] ↵android-platform-12.1.0_r19Android Build Coastguard Worker
into sc-v2-platform-release. Change-Id: I38cad9a6135f313a67dbe06ce57d95f6a11f0dcd
2023-07-17Allow sensors list to be emptyDevin Moore
Test: atest VtsHalSensorManagerV1_0TargetTest Bug: 278013275 Bug: 269014004 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:49600b10aa5675d4e7e985203d69f252ead13e45) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d86376e25df2c601929a2fed3fed875cfe4e56ea) Merged-In: I091f57de9570b0ace3a8da76f16fe0e83f0aa624 Change-Id: I091f57de9570b0ace3a8da76f16fe0e83f0aa624
2023-03-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548271', ↵android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21548272', 'googleplex-android-review.googlesource.com/21548273'] into sc-v2-platform-release. Change-Id: Ica67fc68280e715dcaf1fc77c3842f5bb3c54497
2023-03-10Add removeInstanceForPackageMethod to SensorManagerAnthony Stange
In order to ensure that clients don't leak their sensor manager instance that we currently store in a static map, they need to be able to remove their instance. Otherwise, this instance is never removed from the list and will hang around until our SensorManage instance is destroyed. Bug: 269014004 Test: Run ./libsensorserviceaidl_fuzzer Change-Id: I52185f74ae8d28b379440235ca6f03c5089081f5 (cherry picked from commit 9532f7c682fdd4b1e6e553cd6f61fc0cf2555902) Merged-In: I52185f74ae8d28b379440235ca6f03c5089081f5 (cherry picked from commit on googleplex-android-review.googlesource.com host: 16af3e02e5864c3d97548f0acd05baf5e3341950) Merged-In: I52185f74ae8d28b379440235ca6f03c5089081f5
2023-03-10Remove some new memory leaks from SensorManagerDevin Moore
After catching an error in Sensor::unflatten, there are memory leaks caught by the fuzzer in the same test case. Test: libsensorserviceaidl_fuzzer with testcase from bug Bug: 269014004 Merged-In: I509cceb41f56ca117d9475f6f6674244560fe582 Change-Id: I509cceb41f56ca117d9475f6f6674244560fe582 (cherry picked from commit c95fa0f0e7c7b73746ff850b85a79fc5f92b784e) Merged-In: I509cceb41f56ca117d9475f6f6674244560fe582 (cherry picked from commit on googleplex-android-review.googlesource.com host: cf83b16a403bfa8adf5a1490bbd14c8459e19140) Merged-In: I509cceb41f56ca117d9475f6f6674244560fe582
2023-03-10Check for malformed Sensor FlattenableDevin Moore
Test: libsensorserviceaidl_fuzzer with testcase from bug Bug: 269014004 Merged-In: I0e255c64243c38876fb657cbf942fc1613363216 Change-Id: I0e255c64243c38876fb657cbf942fc1613363216 (cherry picked from commit aeec1802f7befc8fbb18313ad3ac0969c3811870) Merged-In: I0e255c64243c38876fb657cbf942fc1613363216 (cherry picked from commit on googleplex-android-review.googlesource.com host: 54aacdf96a7f57b97f8b6f1a69a8b39ae5ed4b18) Merged-In: I0e255c64243c38876fb657cbf942fc1613363216
2023-02-13Merge cherrypicks of ['googleplex-android-review.googlesource.com/20886664'] ↵android-platform-12.1.0_r14Android Build Coastguard Worker
into sc-v2-platform-release. Change-Id: I5866ab12f6d8e2d853211a286dd41a9fda01c96a
2023-02-13Mitigate the security vulnerability by sanitizing the transaction flags.Sally Qi
- This is part of fix of commit Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df for backporting. Bug: 248031255 Test: test using displaytoken app manually on the phone, test shell screenrecord during using displaytoken; atest android.hardware.camera2.cts.FastBasicsTest Change-Id: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df (cherry picked from commit 3ea58dbc1d7a248160403f089b9998bf6694aae1) Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
2022-10-18Merge cherrypicks of [18122622, 20123803] into sc-v2-platform-release.android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10Android Build Coastguard Worker
Change-Id: Ie3e11a860bda4de97df8a7d240624a3cc965798b
2022-10-18Initialize DrawingState::trustedOverlay to false in constructorRobin Lee
To avoid it being initialised to true randomly. Bug: 199483370 Bug: 196389741 Bug: 218605327 Change-Id: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa (cherry picked from commit edb375df82f6b48688d85c11dbca91adef088bc8) (cherry picked from commit b4a2d3a77ab2fc8b7e3d88c528c71269651f0ddb) (cherry picked from commit c058b4851d187d10a8f134c02c5cf1a22c1a9d39) Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa
2022-10-18Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGELinus Tufvesson
This allows container surfaces to be considered visible in InputDispatcher and prevent touches from passing through them. In particular this is used by ActivityRecordInputSink to block touches that would otherwise pass through the area available to the activity. Bug: 194480991 Bug: 222292477 Test: Manually tested that blocking still works Test: atest InputSurfacesTest Change-Id: Iacfc952139311363b914b1d6bffc2b4190133d02 (cherry picked from commit a18588206c240b34128bb27e3ac875af17fce7f2) (cherry picked from commit 8758cd1030dc9fd73cc98c09ce7b9c356757a659) Merged-In: Iacfc952139311363b914b1d6bffc2b4190133d02
2022-06-14Merge cherrypicks of [17592536, 18764133] into sc-v2-platform-release.android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6Android Build Coastguard Worker
Change-Id: Ida05240506e8789e2541a76cd0c20a588e2559cd
2022-06-14RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in ↵Ady Abraham
stealReceiveChannel Add a mutex to prevent a potential race condition. Bug: 232541124 Test: See bug for details Change-Id: Ia338f124c786bf12d6adba10a67b9048fe9c34a5 (cherry picked from commit 97a317064a76b8fc3a65bd980027f820fd4d53ae) Merged-In: Ia338f124c786bf12d6adba10a67b9048fe9c34a5
2022-06-14DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroedRobert Carr
Otherwise we could leak uninitialized memory to an untrusted process. Bug: 214999987 Test: Existing tests pass Change-Id: I87993fbb920b3af938a311e6afc15383d571823a (cherry picked from commit c2cf02c17af0d7e5f58b8a17ecb9cfcc91a4d2eb) (cherry picked from commit 61a52db9d3a144a8ae4a6a495d61a3b59db80300) Merged-In: I87993fbb920b3af938a311e6afc15383d571823a
2022-05-17Snap for 8589293 from dccd7d4c75f3a988d2e66b84dd0eb247a8df9e95 to ↵android-platform-12.1.0_r5android-platform-12.1.0_r4Android Build Coastguard Worker
sc-v2-platform-release Change-Id: I04b77150dbff74ce1a1ec675c0f5c844d33a62fe
2022-04-26Merge commit '5361fff6a8904b09d619f4b929c40cb10167125f' of ↵Yimin Li
sso://googleplex-android/platform/frameworks/native into HEAD Change-Id: I2a55b6478cc6339754f4c2a46eff874bd1647e5a
2022-04-06Snap for 8412755 from 5ffddadb77954d6de70d5b1e69c692e9e9ba8ee4 to ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseAndroid Build Coastguard Worker
sc-qpr3-release Change-Id: Id79b5ebbd47a3bca193982f22c919d6073dcb19e
2022-04-05[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add ↵Rob Carr
Transaction#sanitize" into sc-dev am: 04caf0c75b am: c226dcf6a2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811474 Change-Id: I4f83fc95854f9792212f575f20cea7319ba431b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05[automerger skipped] DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize ↵Robert Carr
am: 1ff38ab351 am: 5882fa4ab0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811474 Change-Id: Ib3b7345b0bdcdcc8cf9b4098826a6b1c3e0e569f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-dev ↵Rob Carr
am: 04caf0c75b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811474 Change-Id: I4583fd4a36654995c78a503436da43fa75d6205f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize am: 1ff38ab351Robert Carr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811474 Change-Id: I2e02546aa4339b6145fa3ead4eb204252c4cf939 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05[automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add ↵Rob Carr
Transaction#sanitize" into sc-qpr1-dev am: 7c8d637adf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811471 Change-Id: I86b5c5f457929b8782da5e37af018a128b4e11ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05[automerger skipped] DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize ↵Robert Carr
am: 842a412840 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16811471 Change-Id: I047f02dcc35301e6fc5abf0888310223b19e3014 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-devRob Carr
2022-04-05Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-v2-devRob Carr
2022-04-05Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-qpr1-devRob Carr
2022-04-03DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitizeRobert Carr
Various elements of the Transaction interface require a permission in order to apply. In particular the setTrustedOverlay and setInputWindowInfo fields. These permission checks are implemented by checking the PID and the UID of the process which sent the transaction. Unfortunately widespread use of transaction merging makes this inadequate. At the moment IWindowSession#finishDrawing seems to be the only boundary on which transactions move from client to system processes, and so we expose a sanitize method and use it from there to resolve the situation in an easily backportable way. Moving forward it likely make sense to move security sensitive interfaces off of Transaction. Most of the things behind permissions currently are not truly security sensitive, more of just a request not to use them. It was also considered to sanitize transactions at all process boundaries through writeToParcel, however this could be disruptive as previously permissioned processes (WM and SysUI) could freely exchange transactions. As the change needs to be backportable the lowest risk option was chosen. Bug: 213644870 Test: Existing tests pass Change-Id: I424f45bc30ea8e56e4c4493203ee0749eabf239c (cherry picked from commit de6d7b467e572d384f2bc1bc788259340ebe2f93)
2022-04-03DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitizeRobert Carr
Various elements of the Transaction interface require a permission in order to apply. In particular the setTrustedOverlay and setInputWindowInfo fields. These permission checks are implemented by checking the PID and the UID of the process which sent the transaction. Unfortunately widespread use of transaction merging makes this inadequate. At the moment IWindowSession#finishDrawing seems to be the only boundary on which transactions move from client to system processes, and so we expose a sanitize method and use it from there to resolve the situation in an easily backportable way. Moving forward it likely make sense to move security sensitive interfaces off of Transaction. Most of the things behind permissions currently are not truly security sensitive, more of just a request not to use them. It was also considered to sanitize transactions at all process boundaries through writeToParcel, however this could be disruptive as previously permissioned processes (WM and SysUI) could freely exchange transactions. As the change needs to be backportable the lowest risk option was chosen. Bug: 213644870 Test: Existing tests pass Change-Id: I424f45bc30ea8e56e4c4493203ee0749eabf239c (cherry picked from commit de6d7b467e572d384f2bc1bc788259340ebe2f93)
2022-04-03DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitizeRobert Carr
Various elements of the Transaction interface require a permission in order to apply. In particular the setTrustedOverlay and setInputWindowInfo fields. These permission checks are implemented by checking the PID and the UID of the process which sent the transaction. Unfortunately widespread use of transaction merging makes this inadequate. At the moment IWindowSession#finishDrawing seems to be the only boundary on which transactions move from client to system processes, and so we expose a sanitize method and use it from there to resolve the situation in an easily backportable way. Moving forward it likely make sense to move security sensitive interfaces off of Transaction. Most of the things behind permissions currently are not truly security sensitive, more of just a request not to use them. It was also considered to sanitize transactions at all process boundaries through writeToParcel, however this could be disruptive as previously permissioned processes (WM and SysUI) could freely exchange transactions. As the change needs to be backportable the lowest risk option was chosen. Bug: 213644870 Test: Existing tests pass Change-Id: I424f45bc30ea8e56e4c4493203ee0749eabf239c (cherry picked from commit de6d7b467e572d384f2bc1bc788259340ebe2f93)
2022-03-26Snap for 8363780 from 81061238c19d7ebabb453697a8c643324cf6c68e to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: Ia99367d8e76f1ec7fb832dcd4fcdc09d360d95b8
2022-03-21Check incoming array sizes before accessing.Alex Buynytskyy
Bug: 220733817 Fixes: 220733817 Test: presubmit Change-Id: I98972b661fc36906d7d86b366c3f9537dcd17b12
2022-02-23Snap for 8209856 from c5c891ac69e8e08a31f3adc66cce087661f58ad1 to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I1bcf683394666238c81f9af25ec6a28e439029ce
2022-02-22Reduce minimum time threshold on dumpstate_smoke_testSam Dubey
Picked from aosp/1959201 Fix:220828052 Test: atest dumpstate_smoke_test:dumpstate_smoke_test.ZippedBugreportGenerationTest Change-Id: Ic309423babba4e2d03ab7d95b9188faea79b3a41 Merged-In: I37e7707df3237f39d099484a26f195a85f16767a
2022-02-18Snap for 8195019 from bbd9aa6ce6d20355d759ac0b41b44aa79ef9f750 to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I815ff2b5cd13cee0250eab8d135f322f7518be3f
2022-02-17[automerger skipped] SurfaceFlinger: Implement drop input modes am: ↵Vishnu Nair
cbe9c105fc am: 4648ad64f2 -s ours am: f2a0e26203 -s ours am: 36cf85e10a -s ours am skip reason: Merged-In Ibce11ee7df5b5c8c226ebfab29574a99cd656f6d with SHA-1 9b0d13dc44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508594 Change-Id: Ie8c1ee80cfd1f7a657601aa76076eb356bbd3dd7
2022-02-17[automerger skipped] InputFlinger: Add DROP_INPUT feature flags am: ↵Vishnu Nair
0f13fe552d am: f86cec5a48 -s ours am: d25e22dbce -s ours am: a22dfdd3c6 -s ours am skip reason: Merged-In I71d7cf5064c8ce4626cff09b92e15ca38b39cbbe with SHA-1 212dcf44f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508593 Change-Id: I3d43691a6b89d037499e9a647fd2132eaee2d9b5
2022-02-17Snap for 8191458 from 9393f25d2c530de5e536783d715b040043737dd5 to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: Ib0b0f14676cf4f56cd93c7f7bfc45f7d2400e67e
2022-02-16[automerger skipped] SurfaceFlinger: Implement drop input modes am: ↵Vishnu Nair
cbe9c105fc am: 4648ad64f2 -s ours am: f2a0e26203 -s ours am skip reason: Merged-In Ibce11ee7df5b5c8c226ebfab29574a99cd656f6d with SHA-1 9b0d13dc44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508594 Change-Id: Ie3e876d04fac6a851158472befd0a18f95309dee
2022-02-16[automerger skipped] InputFlinger: Add DROP_INPUT feature flags am: ↵Vishnu Nair
0f13fe552d am: f86cec5a48 -s ours am: d25e22dbce -s ours am skip reason: Merged-In I71d7cf5064c8ce4626cff09b92e15ca38b39cbbe with SHA-1 212dcf44f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508593 Change-Id: Ifb3ba14f67a39494d5beb3929d515645908b31e7
2022-02-16[automerger skipped] SurfaceFlinger: Implement drop input modes am: ↵Vishnu Nair
cbe9c105fc am: 4648ad64f2 -s ours am skip reason: Merged-In Ibce11ee7df5b5c8c226ebfab29574a99cd656f6d with SHA-1 9b0d13dc44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508594 Change-Id: Ic7146d0268a50f93c3822a874215643fa02e8b88
2022-02-16[automerger skipped] InputFlinger: Add DROP_INPUT feature flags am: ↵Vishnu Nair
0f13fe552d am: f86cec5a48 -s ours am skip reason: Merged-In I71d7cf5064c8ce4626cff09b92e15ca38b39cbbe with SHA-1 212dcf44f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508593 Change-Id: Id263840eac339bb7decfd556092cc8a0efb7eae4
2022-02-16SurfaceFlinger: Implement drop input modes am: cbe9c105fcVishnu Nair
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508594 Change-Id: I165587ce81cbc15030bca8c385f1e63c80ef27a3
2022-02-16InputFlinger: Add DROP_INPUT feature flags am: 0f13fe552dVishnu Nair
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508593 Change-Id: I3c51969c29fa3b501964651183930e7c7774b071
2022-02-16[automerger skipped] SurfaceControl: Add setDropInputMode api am: 122c4d2da0 ↵Vishnu Nair
am: 0c3407429e -s ours am: dc0120ff41 -s ours am: 27cc85f3f3 -s ours am skip reason: Merged-In I443741d5ab51a45d37fb865f11c433c436d96c1e with SHA-1 77daf700ce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508592 Change-Id: Id695dbdde15afc6d821a79c0be1fb61f9a499566
2022-02-16[automerger skipped] SurfaceControl: Add setDropInputMode api am: 122c4d2da0 ↵Vishnu Nair
am: 0c3407429e -s ours am: dc0120ff41 -s ours am skip reason: Merged-In I443741d5ab51a45d37fb865f11c433c436d96c1e with SHA-1 77daf700ce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508592 Change-Id: I2233c9af21ab8389ac0f1fc90eb4406430bb8be7
2022-02-16[automerger skipped] SurfaceControl: Add setDropInputMode api am: 122c4d2da0 ↵Vishnu Nair
am: 0c3407429e -s ours am skip reason: Merged-In I443741d5ab51a45d37fb865f11c433c436d96c1e with SHA-1 77daf700ce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16508592 Change-Id: I8a6b181d61577dde0d97b8340a44ade1a3ebc3f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 05:19:24 +0000