summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-09Merge cherrypicks of ['googleplex-android-review.googlesource.com/22865717', ↵android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s1-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/22931281'] into tm-qpr3-c-release. Change-Id: I6e29173bcb1e1b7e66724dee3b6b9f59e7508767
2023-05-09DO NOT MERGE Reverts WindowInfosListenerInvoker throttlingPatrick Williams
Revert "DO NOT MERGE: Force input window updates when layer visibility changes" Revert "SF: throttle WindowInfosListener calls" The reverted CLs may be causing input issues where InputDispatcher doesn't seem to align with the windows currently displayed. This reverts commit 243e2e9af82700c76f743ee71e0f27fe1a3f4383. This reverts commit f3213d2ca821472b12ce2452e4bd33b4cd152e8f. Bug: 279649321 Bug: 270894765 Test: presubmits (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fd9c44fb10610d8c9d7f698868a4f6a5d0547fd9) Merged-In: I8eb46caced6f395460fabc1d6a529a88c1c4566b Change-Id: I8eb46caced6f395460fabc1d6a529a88c1c4566b
2023-05-09Add pending command buffer resetHuihong Luo
when error occurs, so it won't affect the upcoming commands. Bug: 273525126 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3fd3acc99b20cd29837053716086eca8406cd3b0) Merged-In: I08f938764dda78e6a85e625ae6767816582f5312 Change-Id: I08f938764dda78e6a85e625ae6767816582f5312
2023-05-04[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-10055797-L00100000960423622 into tm-qpr3-c-release. COASTGUARD_SKIP: Iec39c06f56f492f9430c4e9dcbf2dbfb3301440f COASTGUARD_SKIP: I08f938764dda78e6a85e625ae6767816582f5312 Change-Id: I1f6765f53c5d3e80d3a5e1ec049bb8adcf70c570
2023-05-04Merge cherrypicks of ['googleplex-android-review.googlesource.com/22865717'] ↵Android Build Coastguard Worker
into sparse-10055797-L00100000960423622. SPARSE_CHANGE: I08f938764dda78e6a85e625ae6767816582f5312 Change-Id: Iec39c06f56f492f9430c4e9dcbf2dbfb3301440f
2023-05-04Add pending command buffer resetHuihong Luo
when error occurs, so it won't affect the upcoming commands. Bug: 273525126 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3fd3acc99b20cd29837053716086eca8406cd3b0) Merged-In: I08f938764dda78e6a85e625ae6767816582f5312 Change-Id: I08f938764dda78e6a85e625ae6767816582f5312
2023-04-14Snap for 9929149 from 04a038456b9b53c18621c95add857a044a2a4e65 to ↵Android Build Coastguard Worker
tm-qpr3-c-release Change-Id: Idafa5b534a4ae61397dc85a34049db90cc7e12e6
2023-04-11Merge changes from topic "clamp-alpha" into tm-qpr-devVishnu Nair
* changes: SF: clamp alpha value instead of error SurfaceComposerClient: add a range check in setAlpha
2023-04-11SF: clamp alpha value instead of errorAdy Abraham
SF tests expect that invalid alpha values will be clamped instead of returning failure. Test: atest SurfaceFlinger_test:SurfaceFlinger_test Bug: 274213741 Merged-In: I1318f21c21ec9b3fe9577ac3b9f32605e7f7f13a Change-Id: I1318f21c21ec9b3fe9577ac3b9f32605e7f7f13a (cherry picked from commit 24d0b2a19705cc64933bb6dfaf7147207a64e607)
2023-04-11SurfaceComposerClient: add a range check in setAlphaAdy Abraham
Merged-In: I172321a4d3533e0506bad75a0a91e33fe921c2b7 Change-Id: I172321a4d3533e0506bad75a0a91e33fe921c2b7 Test: presubmit Bug: 274213741
2023-04-05Merge "Remove coordinate swapping in region sampling" into tm-qpr-devWinson Chung
2023-04-05Remove coordinate swapping in region samplingAlec Mouri
Captured screens for region sampling were originally rendered upside-down, which required swapping coordinates to sample from the correct area in the output buffer. Since then, several fixes to the screenshot path have landed, which treat screen orientation consistently, so the captured images are no longer upside-down. But, the coordinate swapping was never removed. Remove it now, as sampling during landscape is now broken. Bug: 133849373 Bug: 241967077 Fixes: 275661349 Test: Split screen in landscape with settings app in dark mode, calculator in light mode, and trigger back gestures Change-Id: I52c65032d33d01a4407dc1b30215e7edac6eb1ea (cherry picked from commit 439b60968f1fe544b79a5c5ba4657fca9e82b54a)
2023-04-05Merge "DO NOT MERGE: Force input window updates when layer visibility ↵TreeHugger Robot
changes" into tm-qpr-dev
2023-04-04DO NOT MERGE: Force input window updates when layer visibility changesPatrick Williams
This should fix a latency regression introduced by delaying input window visibility changes. See ag/22210759. Bug: 270894765 Bug: 275562923 Test: v2/android-crystalball-eng/health/microbench/instr_metric/input_method Change-Id: I0f64fa148eb4b02600eac9578d3d23ac00c78fa3
2023-04-04Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev am: ↵Timothy Yiu
b3191a4aa7 am: 3ccc4ac693 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206 Change-Id: I52d6e75018ee6cc42a9dcc18be0d07adcc18cec5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c16 am: bc9a36a8betyiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206 Change-Id: Iee531f2b1673596d7007788a0a94b780c06457d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev am: ↵Timothy Yiu
b3191a4aa7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206 Change-Id: I73d2ca70750229b8ead3f6ad1242d9cdd3f15bf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c16tyiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206 Change-Id: I6a80c742f1a940746047835fd6e429ab20e65aa3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-devTimothy Yiu
2023-03-23Merge "SF: throttle WindowInfosListener calls" into tm-qpr-devTreeHugger Robot
2023-03-22SF: throttle WindowInfosListener callsPatrick Williams
This change updates WindowInfosListenerInvoker to delay and drop messages when there are unacked messages. When WindowInfosListener calls are acknowledged before the next windowInfosChanged call, there is no behavior change. If windowInfosChanged is called and there are unacked messages, then the update is delayed and sent once the messages are acked via WindowInfosReportedListener. If windowInfosChanged is called and there is already a delayed update, then the previous delayed update is overwritten and only the latest update is sent. WindowInfosListeners are still called immediately when there are focus requests. This means the number of unacked messages may be greater than one. Bug: 270894765 Test: presubmits Test: manual fuzz testing (random sleeps added to input flinger listener) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a364bd7c0ecc412582eff1160368f3eaa2b4c6f0) Merged-In: I78b39b10c52f4e4939f1741516d0edbe9898ef3c Change-Id: I78b39b10c52f4e4939f1741516d0edbe9898ef3c Change-Id: Ib796d8b459d2157b96acdb334404353ca6b1da61
2023-03-22tracefs permissions: fix throttled_rss_stat/enable on user buildsRyan Savitski
throttled_rss_stat is a synthetic event derived from kmem/rss_stat via hitogram/trigger machinery in tracefs. The existing MAC and DAC permissions allow us to do everything except actually enabling/disabling the recording of the synthetic event. userdebug builds work because we fall back onto a generic enable/disable set_event mechanism that is debug-only. From strace on a debuggable build: openat(AT_FDCWD, "/sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable", O_WRONLY|O_CLOEXEC) = -1 EACCES (Permission denied) And the corresponding file permissions: /sys/kernel/tracing/events/synthetic/rss_stat_throttled $ ls -alZ -rw-r--r-- 1 root readtracefs u:object_r:debugfs_tracing:s0 0 2023-02-20 19:26 enable Tested: patched onto an internal branch, flashed panther-user, collected trace with perfetto Bug: 270060883 Merged-In: I25dcb6d9fa60066fd59f2d1dc796baceb3b6b419 Merged-In: I6001eec487932ab1fd869231815fbf485b7370bb Change-Id: I6001eec487932ab1fd869231815fbf485b7370bb (cherry picked from commit 231446d0f0dce6db16ba158113c09719fa562e9e)
2023-03-15Merge "Changing OWNERS for gpuservice tests" into android13-tests-dev am: ↵Serdar Kocdemir
d1a69dd708 am: ac3b73286a am: 34dd270375 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2486589 Change-Id: I08eb3dd18ee94b769f3b583f21bc12de2066bfcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Changing OWNERS for gpuservice tests" into android13-tests-dev am: ↵Serdar Kocdemir
d1a69dd708 am: ac3b73286a Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2486589 Change-Id: I716abfc3f6b0dd50a1da3581364e54351abe7c92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Changing OWNERS for gpuservice tests" into android13-tests-dev am: ↵Serdar Kocdemir
d1a69dd708 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2486589 Change-Id: I8691279aafd8fb9a78bad147fc0fd0453928be2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Changing OWNERS for gpuservice tests" into android13-tests-devandroid13-tests-devSerdar Kocdemir
2023-03-15RESTRICT AUTOMERGE: Fix HMAC Compare time attacktyiu
Added constant time HMAC comparison preventing attackers being able to forge HMAC for input by measuring the time difference between non-constant time comparison of HMAC Bug: 261085213 Test: None Tag: #security Change-Id: I7cd6b68589fd0042b9396dc599b917a0f3220ff7
2023-03-14Changing OWNERS for gpuservice testsSerdar Kocdemir
Bug: b/248501602 Test: atest GpuWorkTracepointTest Change-Id: Ifc4677d38fd90a923846e19a3b59b2effeb60984
2023-03-03Merge changes from topic "topic_for_cp_sensorservice" into tm-qpr-devDevin Moore
* changes: Add removeInstanceForPackageMethod to SensorManager Remove some new memory leaks from SensorManager Check for malformed Sensor Flattenable
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
4521fbf809 -s ours am: 0e2142266f -s ours am: e86a721418 -s ours am: 81d19021d9 -s ours am: a8609be8fd -s ours am: 0905d59160 -s ours am: ef995eea71 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 be6b8a58e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548959 Change-Id: Ifac3246455d9007751305d0d5c33460af9945e20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
ceb0d52273 -s ours am: 433d09d7e8 -s ours am: 7fdc57640b -s ours am: 317bb6bc10 -s ours am: cd9c00fc77 -s ours am: 19d8355d35 -s ours am: f2806e5001 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 93a74aaca9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548678 Change-Id: Ib8f22591a4c016f901316839679abe70abd8f888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: f1aa5fb534 ↵Devin Moore
-s ours am: c8c2b5c765 -s ours am: c90ad2b776 -s ours am: 6e35e696f7 -s ours am: c975edc9a2 -s ours am: 0968c9202e -s ours am: e7bc8b59ea -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 6d2f8c5598 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548677 Change-Id: I9bf5337178177cb847444169f469675a38abad77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
be6b8a58e6 -s ours am: 92c4deb4ca -s ours am: b456f7880c -s ours am: 9297da4201 -s ours am: 87115667bf -s ours am: 3a9ccece39 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548675 Change-Id: I54098ad1de835979d11634574447b938cdd13f95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
93a74aaca9 -s ours am: 43b8e44a90 -s ours am: 85395dcd89 -s ours am: bf2319a25b -s ours am: 4a9cff93a0 -s ours am: c80bbf3947 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 e54698d02c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548674 Change-Id: Ic00d88221a762d605bf8ed4ab4ac17e0845aef57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: 6d2f8c5598 ↵Devin Moore
-s ours am: 317eb62d67 -s ours am: 5bea13857f -s ours am: 0e184fef3b -s ours am: 05f685f74a -s ours am: 2ac5ebceeb -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 9170e60bf6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548673 Change-Id: I604a9ba066330de2ec9cb297b80c07147efe96fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge changes from topic ↵Devin Moore
"cherrypicker-L53600000958769418:N05800001340074698" into sc-v2-dev am: 14f6ffd210 -s ours am: 58fa52b5cf -s ours am: 05296b9e3f -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548273 Change-Id: Ifecbb11a418d25efe600eba399c24a9bdfeef84f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
16af3e02e5 -s ours am: 24aa868e84 -s ours am: 00c0cd3e25 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548273 Change-Id: I2cd916fecc0dff99f0d3f694c517f060b0766cb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
972675ed81 -s ours am: 9fde0d4eeb -s ours am: 51a46d33ef -s ours am: 32b9a2469f -s ours am: 793977f4e1 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 dd5384d875 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548671 Change-Id: I480c810387d3fe1440ebdf10ba9a11456ca97dcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
e54698d02c -s ours am: c9ead08299 -s ours am: b0f2d9d73b -s ours am: ab92ef8660 -s ours am: 06028eeed7 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 6447432d8e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548670 Change-Id: I5cc94d36ea69ed9d88b1ca7ff4d4edc44cd0891a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: 9170e60bf6 ↵Devin Moore
-s ours am: e6d5ee9928 -s ours am: 8914ea5bda -s ours am: cf5e376368 -s ours am: 264c4f763b -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 d1fe364455 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548669 Change-Id: I5ad9726e8f1f02efe3d865afd922d8f728a29a0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
dd5384d875 am: 7eee112d06 -s ours am: c3f9df51fb -s ours am: 7e3e625983 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 39e2df7305 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548276 Change-Id: I0349cb130df8584c6d0a221dff1292440d91b024 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
6447432d8e am: 5662dac29e -s ours am: 60a3e38c54 -s ours am: 8ceef423d5 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 2f8fa1367c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548275 Change-Id: I267d3ac78e09d4bde825dcfb6495965403c3bba1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: d1fe364455 ↵Devin Moore
am: e55af01f2f -s ours am: 8289851cfb -s ours am: e345ac6dc5 -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 962b5a4d37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548274 Change-Id: Ib6ead278eb87d1f7a49dc4cb9079bf4b46ab648d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
4521fbf809 -s ours am: 0e2142266f -s ours am: e86a721418 -s ours am: 81d19021d9 -s ours am: a8609be8fd -s ours am: 0905d59160 -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 be6b8a58e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548959 Change-Id: I70ed16f0dca4b8b9676815ee6d0040b19daacc73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
ceb0d52273 -s ours am: 433d09d7e8 -s ours am: 7fdc57640b -s ours am: 317bb6bc10 -s ours am: cd9c00fc77 -s ours am: 19d8355d35 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 93a74aaca9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548678 Change-Id: I0684ebd20679728bc036c369bec72390eabe2bee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: f1aa5fb534 ↵Devin Moore
-s ours am: c8c2b5c765 -s ours am: c90ad2b776 -s ours am: 6e35e696f7 -s ours am: c975edc9a2 -s ours am: 0968c9202e -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 6d2f8c5598 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548677 Change-Id: I1788a0b267f36d319653d843efc13d1b4548e287 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Add removeInstanceForPackageMethod to SensorManager am: ↵Anthony Stange
be6b8a58e6 -s ours am: 92c4deb4ca -s ours am: b456f7880c -s ours am: 9297da4201 -s ours am: 87115667bf -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548675 Change-Id: I192567a3bb9191ac9a78ef82fb1746aeb28c6124 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Remove some new memory leaks from SensorManager am: ↵Devin Moore
93a74aaca9 -s ours am: 43b8e44a90 -s ours am: 85395dcd89 -s ours am: bf2319a25b -s ours am: 4a9cff93a0 -s ours am skip reason: Merged-In I509cceb41f56ca117d9475f6f6674244560fe582 with SHA-1 e54698d02c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548674 Change-Id: I3a5909f8c8a44165359728815d43a5e7ba5484ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Check for malformed Sensor Flattenable am: 6d2f8c5598 ↵Devin Moore
-s ours am: 317eb62d67 -s ours am: 5bea13857f -s ours am: 0e184fef3b -s ours am: 05f685f74a -s ours am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 9170e60bf6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548673 Change-Id: Ia3558d666b391f3883fa76e40b4c21b58ec96ea8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge changes from topic ↵Devin Moore
"cherrypicker-L53600000958769418:N05800001340074698" into sc-v2-dev am: 14f6ffd210 -s ours am: 58fa52b5cf -s ours am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548273 Change-Id: I858ec2c39b7dc743730c993ceddd7899d83c55df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>