summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-08Merge cherrypicks of ['googleplex-android-review.googlesource.com/24325778'] ↵android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseAndroid Build Coastguard Worker
into udc-d1-release. Change-Id: I105324d7c38d5caf0063a4bb7443b15b9cc90c6e
2023-08-08Fix extended range handling when Gamma OETF is usedAlec Mouri
Populating fakeOutputDataspace got dropped, which turned off the one-off workaround to bypass skia's color management to encode as gamma 2.2. Turn it back on to prevent flickers on some devices. Bug: 293311643 Test: SilkFX test app (cherry picked from commit e0bb6f4ff13cc45b61a1b0edccbf875bb3871c89) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fad6ef537b2e96a6f5aaeb6a70dd63fc389e18ff) Merged-In: I4370756c48fe79c1b4fcbd88a3bf2579fde1bf65 Change-Id: I4370756c48fe79c1b4fcbd88a3bf2579fde1bf65
2023-08-04Merge cherrypicks of ['googleplex-android-review.googlesource.com/24241899', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/24286326'] into udc-d1-release. Change-Id: Iaca15c1b98b879645ecdb799f0f3c590b856dc05
2023-08-04Update IsStrictRun to be framework-onlyKevin Jeon
This change guards IsStrictRun using __ANDROID_VNDK__ to avoid needing to update the prebuilt ABI dumps in internal, since IsStrictRun is only needed in the framework and does not need to be made available to vendors. This avoids updating the API surface unnecessarily. Test: Cherry-pick this change to internal and verify that internal builds work without needing to update the prebuilt ABI dumps. Ignore-AOSP-First: This is already in AOSP, but needs to be cherry-picked here first before being removed from AOSP. Bug: 283326935 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7e2d1beb3cfa1b85f3e7ef7bedc5afa29ca83ee7) Merged-In: I9dfdf3306b6a9b0faa9f8f7871b1fc244bde1a97 Change-Id: I9dfdf3306b6a9b0faa9f8f7871b1fc244bde1a97
2023-08-04Add sysprop for identifying strict-run bugreportsKevin Jeon
This change adds 'dumpstate.strict_run', which sets stricter timeouts on flaky sections. The default value for this property is 'true'. Test: Build, wipe, and flash, then verify that: 1) the strict-run log is emitted when taking a bug report 2) manually running 'setprop dumpstate.strict_run false' results in the strict-run log not being emitted in the next bug report Bug: 283326935 (cherry picked from https://android-review.googlesource.com/q/commit:fa64e6412bd607e198a199b39cc18024e6e99105) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a5a1a92dfdf911e095a0298a1b4f81905d9efec) Merged-In: Ic40b235f710b2858ec8ca463a8f6a796d9e6c98e Change-Id: Ic40b235f710b2858ec8ca463a8f6a796d9e6c98e
2023-08-02Snap for 10601469 from 6f1dcd5a35ca21c65de973a827fef08cb6cdee6a to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ic0c4a0bb9bcc8c9a2e0bf7d1ee5c9447d9bc9a16
2023-08-02Merge "BQ: Fix deadlock introduced by onFrameDequeued" into udc-d1-devShuzhen Wang
2023-08-01BQ: Fix deadlock introduced by onFrameDequeuedShuzhen Wang
BufferQueueCore::mMutex should never be locked when calling consumerListener's callbacks. The reason is that the consumerListener callback could in turn acquire BufferQueueCore::mMutex, resulting in deadlock. The deadlock stack trace for onFrameDequeued is: - BufferQueueProduer::dequeueBuffer acquires Core::mMutex - ProxyConsumerListener::onFrameDequeued::onFrameDequeued promotes a ConsumerListener wp to sp - The sp becomes the last reference to the ConsumerListener object, when onFrameDequeued() goes out of scope, ~ConsumerListener is called - BufferQueueConsumer::disconnect is called as part of ~ConsumerListener(), and disconnect needs to acquire Core::mMutex The same issue applies to onFrameCancelled and onFrameDetached. Test: atest BufferQueueThreading::TestProducerDequeueConsumerDestroy Bug: 270004534 Change-Id: I22fdc637ccc937594656d6f5bc1ee9b7c506490a Merged-In: I22fdc637ccc937594656d6f5bc1ee9b7c506490a
2023-07-29Snap for 10580647 from f6dc23b2a3940d00d7584c854be260bb82c8880b to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ifccf55aa084b7f66ae267266c8fd6c46e3cfafe5
2023-07-27Snap for 10573380 from e1c5163479ef3b88838dc8c370150e93cb0441e0 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I0c4e3a62069a4e0841fc1a477d2fdd7aaeea224c
2023-07-27Merge "RenderEngine: Limit the size of blur input to the display size" into ↵Treehugger Robot
udc-dev am: be2ac9c753 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24193668 Change-Id: I592a8a41290c441dd837a467991a1d8925c3fcfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "RenderEngine: Limit the size of blur input to the display size" into ↵Treehugger Robot
udc-dev
2023-07-27Merge "UltraHDR: Add Adobe HDR gain map notice" into udc-dev am: 6c5d50bfeeTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24168505 Change-Id: Id5525d92a7cc80aefd78ef450cc4cbda20b2c19a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "UltraHDR: Add Adobe HDR gain map notice" into udc-devTreehugger Robot
2023-07-26UltraHDR: Add Adobe HDR gain map noticeEino-Ville Talvala
Bug: 292284515 Test: Builds Change-Id: Ifd263d93e1c1b8bb8043712283e38e4434079f85
2023-07-26RenderEngine: Limit the size of blur input to the display sizeLeon Scroggins III
Some layers are extraordinarily large. In the particular case we've found, the layer does not have any content, but even if it did, content outside the display would not impact the blur. So limit the size of the rectangle we use for blurring, which in turn limits the size of the buffers we allocate to compute the blur. Use the canvas' existing clip, which has already been adjusted to the size of the display. Bug: 283427479 Bug: 292539958 Test: manual (logcat) Change-Id: I17e646cce0dca02f4e6a18032ecd1e9120fcf880 Merged-In: I17e646cce0dca02f4e6a18032ecd1e9120fcf880
2023-07-24Snap for 10551705 from 4546de0814ce7fdd0afed47c5ef833788cb1d79e to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I6cec041379bfc03464ffe7427b50b52f289d7b0d
2023-07-21Fix brightness change during screenrotationJohn Reck
When doing a layer capture for seamless transitions avoid clamping the max HDR headroom. Fixes: 288063548 Test: repro steps in bug Change-Id: Ic90c8b4478ad90b1776c455cbe696ec22182496d (cherry picked from commit 1dadaa6b78f2939e717451303cd29d8f683e5f08)
2023-07-20Snap for 10535824 from d430717d81ee3053db7c707a2ab5276e0f5c938f to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ib91d015ceb157999ee63069158e0a0eaa46aab75
2023-07-20Fix return value of AidlSensorHalWrapper::configureDirectChannelArthur Ishiguro
Fixes: 287721163 Test: Test on device Change-Id: I9585d8c1a285e27ed8c1f506dd9ac24a47631f93 Merged-In: I9585d8c1a285e27ed8c1f506dd9ac24a47631f93
2023-07-15Snap for 10503246 from 7dae9c10f1588f48da9ce8015b75ebdc54be8a8d to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I49195f87e426a888002dc4af498cfb21108afcaa
2023-07-14Propagate the 170M->sRGB lie everywhere.Alec Mouri
If the device is configured to decode SDR video standards as sRGB, then we need to do this for screenshots and caching as well. See patch I64fc8f2ea77f8e595333de36fb9da2979d8316ca for why we allow for reinterpreting 170M as sRGB. Bug: 288330598 Test: Netflix full screen, disable HW overlays, then swipe to home Change-Id: Ie4eabd6301826fcb9e302ba6079f7f6b94e5a8b8
2023-07-11Snap for 10478082 from 1c5a29c71795e30e9dc8ec08415d1eba9a1071cc to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I59b7df9c08e650db27221643406d0197b08364d8
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am: 7ed143a5e9 -s ours am: a8a539955c -s ours am: ce68dd7ef3 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I17cf1b39c03ea770ef9a6ce55fc8fcf28d038662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am: a7d1ab18e5 -s ours am: d750a46617 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: Ibbf0253698345079d9210324318d74553471bd04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am: 7ed143a5e9 -s ours am: a8a539955c -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: Ia96901ed1cd1a291adb76d9956f4f27ec49c278b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am: 7ed143a5e9 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: Idb98e606f3615c2a6f79e1e6f4474acc15cad3fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am: a7d1ab18e5 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I63384207add35ce04706e6eace51c0abb8fd6a38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: Icab0f8d912b0e4f9cc743ecadd9c5deac2a52fee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am: ea256bece0 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I1b8d4181767020c9efbc3835e6d3381762524d24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
24a7874bb4 am: bc5214e0dc am: 2039b815e3 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I3a1639cf19d7d0f4a33a247a8b185f3365525c47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: 24a7874bb4 am: bc5214e0dcsergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I26c7c10dadc8f4eec8392130a0357e3505a5de00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: 24a7874bb4sergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808 Change-Id: I82fbc5e1dab9df417fb7da6a18a8ebfac19a21f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
7fb707802e am: 4ca2500fe6 am: 69580b9a26 -s ours am: ef318d5f81 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: I7ce68fe01a47d74965be4c9cb32e13c6bdc620f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
7fb707802e am: 979c25499a -s ours am: ac20ad5aa4 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 a8186037a7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: I8b058ac60467004333b39707d8b3291b140b7b2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
7fb707802e am: 4ca2500fe6 am: 69580b9a26 -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb707802e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: I576dd4fac65c76cc11a00159acac16f0f31cdc35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: 7fb707802e am: 4ca2500fe6sergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: I48fb105c71ef3d56643016445daa31fcfef6e5f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: ↵sergiuferentz
7fb707802e am: 979c25499a -s ours am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 a8186037a7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: Ice85fd1970fc07b3ffde35f514134f69a5db4a01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: 7fb707802esergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: I786d52e608b0e8d31219b094e9c4b90c549491ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: 7fb707802esergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871 Change-Id: Ieac80b880878225d914efb41e78385eb76b3a690 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Fix for heap-use-after-free in GPUService.cpp am: a8186037a7sergiuferentz
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899875 Change-Id: Iaa4d9327555a073d06dfbdeddf16fe8a7ac4d8ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Fix 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. Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 Bug: 282919145 Test: Added unit test and ran on device with ASAN Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 (cherry picked from commit 3c00cbc0f119c3f59325aa6d5061529feb58462b)
2023-07-05Fix 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. Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 Bug: 282919145 Test: Added unit test and ran on device with ASAN Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 (cherry picked from commit 3c00cbc0f119c3f59325aa6d5061529feb58462b)
2023-07-05Fix 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. Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 Bug: 282919145 Test: Added unit test and ran on device with ASAN Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029 (cherry picked from commit 3c00cbc0f119c3f59325aa6d5061529feb58462b)
2023-06-29Snap for 10412612 from 2bd7c89d5f7ab43b97dbb04717950a785a3a48e5 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I193bfafc13e8ed2b6503c5c81e4af3330cbc1078
2023-06-29[automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: ↵Treehugger Robot
d6684f4bfb -s ours am: 07bf8f73bd -s ours am: 74e8962f1c -s ours am: fe8e4d212b -s ours am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150 Change-Id: Iae2820a0ac5a8c0f76c4c93986155b0cad9f0341 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] Allow sensors list to be empty am: d9e0d0ad7c -s ours ↵Devin Moore
am: 9894e1768f -s ours am: 1e324d2fc0 -s ours am: 255ffb0420 -s ours am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150 Change-Id: I42337613360fa7d83001d4e47eff62c528ef8dc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] Allow sensors list to be empty am: 7057a9f08d -s ours ↵Devin Moore
am: f83458bfd1 -s ours am: 08e184f88b -s ours am: a02918ba4d -s ours am: eb76276b8a -s ours am: 5e8a5c9778 -s ours am: b5e3f34126 -s ours am: 08c9a88f91 -s ours am: 064989a133 -s ours am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677151 Change-Id: I62a909cfc74a9a5fe7244b8d3c88faba9ddd23cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] Allow sensors list to be empty am: a7f26ab197 -s ours ↵Devin Moore
am: 4cba4ba7c8 -s ours am: 29229e7c6b -s ours am: 64a97f4656 -s ours am: 1641d414c5 -s ours am: ca33ffa3da -s ours am: 12e595b2de -s ours am: e259857552 -s ours am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 55e73922b2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677156 Change-Id: I16abdbc90a6fb4e75ef8150c78a80c57c86123b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] Allow sensors list to be empty am: 55e73922b2 -s ours ↵Devin Moore
am: f6edcdaa64 -s ours am: c06ffa0f21 -s ours am: 24a83cb9f3 -s ours am: ae1574ed1e -s ours am: 35d584c873 -s ours am: bf4dec8609 -s ours am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d447f022af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677154 Change-Id: I5384d4d999e46e22728d56caea7d68b0d62d3b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 13:35:38 +0000