summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-01Snap for 8892843 from 3a49f0a4c5685162f430dc7fcd5c1a7967d007c8 to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseAndroid Build Coastguard Worker
Change-Id: I75c82dc6e6f1c1bc1c17da81bba65a27212c3083
2022-07-30CE: Pass the fence with the cached client composition bufferVishnu Nair
Composition cache checks the buffer id with the client composition request to see if we can reuse a buffer if the request has not changed. We never bothered with a fence here because by the time the cache was accessed, we would have sent the buffer to the display at least once. With composition strategy prediction, our assumption breaks. There is a chance we fail to predict the strategy but the new strategy results in the same client composition request so we can reuse the client composition work that was submitted in the beginning of the frame. Test: Repro steps in bug Test: go/wm-smoke Bug: 239944175 Change-Id: Idbe6a9bb3bba889aa7b459b1046890ea3960982f
2022-07-25Snap for 8866741 from 4830cd6ad9d045f6aefd134e41822c570067605d to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I56b4b95044395a513706d37ef8c9c0c24c810155
2022-07-25Merge "Fail gracefully when allocating screenshot buffers" into tm-d1-devNT Tsai
2022-07-21Fail gracefully when allocating screenshot buffersAlec Mouri
Some devices have limited protected memory, and over-allocate buffers in the decoder during DRM playback of high resolution content. The decoder is able to fail gracefully, but SurfaceFlinger is stricter, causing the device to crash. More generally, SurfaceFlinger should not be so strict, because a malicious app could intentionally allocate many buffers and cause the system to crash. So, fail gracefully instead to prevent the entire system from falling over. Bug: 236200340 Test: 4K DRM playback Change-Id: Ia0018974fffc753342f78917ede0b67faa94916b
2022-07-16Snap for 8837247 from b9c09f87e2397e25f8b32a226480d42be48abc98 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I2f8b4f304ccdd98293ad74ca9bdf51173975bcb4
2022-07-15Merge "Release RefreshRateOveray's SurfaceControl on the main thread" into ↵TreeHugger Robot
tm-d1-dev
2022-07-12Snap for 8822666 from a2bcc5fe998c5dae62f2092424acefbdd718479f to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I672a46d035b50e08c90affab281adafe06a94a0e
2022-07-12Release RefreshRateOveray's SurfaceControl on the main threadAdy Abraham
SurfaceControl assumes that its destruction happens without SurfaceFlinger::mStateLock held, otherwise it causes a deadlock. Bug: 237485868 Test: Enable refresh rate overlay and change resolution Change-Id: I152586aaaf414ed0b90a6e6a8d78e867146ab96c Merged-In: I152586aaaf414ed0b90a6e6a8d78e867146ab96c
2022-07-12Reconcile native and Java parcel code for WorkSource. am: c1359ac51cMichael Wright
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19135348 Change-Id: I2a819448c67ea57bbcf3b9ff991d218b21194320 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06Snap for 8802662 from f02724cd57aa5e339d3fc215f8d527a80a091e8a to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ieb899f8f89a366e59d72225ec729f9f999481908
2022-07-02Snap for 8792958 from 75830e7b1d21b05546c22fed85f227f8fb4c09f6 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I1f7827d4a6ee764974672d5967e6449cdf5e2cec
2022-07-01Dump IInputProcessor when dump is calledSiarhei Vishniakou
We need to dump this process because it may become unresponsive. Currently, it's missing from the dumps. After this change, I'm finding the following data inside bugreport: ----- Waiting Channels: pid 1794 at 2022-07-01 21:08:01.751449995+0000 ----- Cmd line: /vendor/bin/hw/android.hardware.input.processor-service sysTid=1794 binder_wait_for_work sysTid=1804 futex_wait_queue_me ----- end 1794 ----- Bug: 237347585 Bug: 237322365 Test: adb bugreport Change-Id: Id5a1a2cba2131e58a4eadd4492f9d1c82de4d746 Merged-In: Id5a1a2cba2131e58a4eadd4492f9d1c82de4d746 (cherry picked from commit a32c371fa7caaa8744b98778f7a39524c49d33dd)
2022-07-01Reconcile native and Java parcel code for WorkSource.Michael Wright
Prior to this change, native work sources didn't read or write any information concerning WorkChains, but Java ones did. This lead to a mismatch when Java code, such as PowerManagerService, unparceled the WorkSource as it read the whatever the next 4 bytes happened to be as the WorkChain count, but it was actually reading whatever the next item in the transaction happened to have written. Note that this change does _not_ attempt to add a WorkChain implementation to native. It instead makes it so that WorkSources written from native to Java, or Java to native with no WorkChains, are correctly and symmetrically parceled. In addition, if a Java WorkSource is sent to native with a non-zero amount of WorkChains associated, then it will return an error when unparceling rather than continuing but leaving in the Parcel in an undefined state. Bug: 234429395 Test: atest WorkSourceTest.cpp Test: Write sample native app that grabs wakelock, validate display ID Change-Id: Id1a5f29f4ccf2996e37ec99014ce392599b6b725
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours am: fbceef0329 -s ours am: b8091bc399 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: Ic192e9a7769f51ad13eac6ebb313201798106828 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours am: fbceef0329 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I3a856100d06f1286def71626a3a4601cd8d1d34a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 35ec750a23 -s ours am: 118101fd6f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I6b93cdd0dcc3b49d2fd32a6f4da41bc954d05132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours am: 034f4efd98 -s ours am: 452bd0d954 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I0b31e7cbfe574b48c0f54b8f07b2d1172f42b08a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 4c0e43192b am: 4563b6a255 -s ours am: 7052ac032a -s ours am: db014e3087 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: If7518ae256759e8b5057084a880ca2868c2bbe8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I0822d80b662805d487867caa2ad0c711e58640d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 35ec750a23 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: Iba8bd3eaebbb668021c46fa13c7edb8d6c3a0536 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I62851820f6e4f3fe1fae92a4e14f3c6455e4392f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours am: 034f4efd98 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: Iac46627c7b943c3a4af52692c439de844bbc8814 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 4c0e43192b am: 4563b6a255 -s ours am: 7052ac032a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I6b2453a7d780790e9fdd4286c099c2bd3950ca77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I94528791d372403d992ba019ac31ed0296f98b33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-dev am: 201f54d7c6 am: c9912eb5f0 -s ours am: 43837636d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: Ifa7b538c1d149ef8983a6d4e15ea8631769f9c5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 4c0e43192b am: 2fb2b9b16d -s ours am: 78cdbeccf2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: If7a02657d1e51ff0fbe8bde27420c1f8dacad457 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: If813530a876683027984fcf0e988942d23873a0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 4c0e43192b am: 4563b6a255 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: Ice153b7e1ade56c9626f4ca21582b4747b0d1370 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-dev am: 201f54d7c6 am: c9912eb5f0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I93e45af7d6eb4ceed9bca2bcbf78933ecb8062d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 4c0e43192b am: 2fb2b9b16d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: Ia5d316ccda70dcdb0638c01e2f554c757ef9ab8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-v2-dev am: f5aaf7019d -s ours am: fc81bc567d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622 Change-Id: Id53e62db59db1bb6b3f844d00afb3b4ea788e45b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 8758cd1030 -s ours am: 16dc9262f9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622 Change-Id: I00bd403dc05f32cf31399f83ccdad39be03ae230 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: c7df484a6f am: 193b8969e5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I968f84be902696f884feb0a4043f8094cfc7e220 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-dev ↵Linus Tufvesson
am: 201f54d7c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I722b8a49321f8cb4bfbd37c0836fad52aa87950e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE am: 4c0e43192bLinus Tufvesson
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I547653f413b26a7cc44828b9c3e89ecdcca5b203 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-dev ↵Linus Tufvesson
am: 201f54d7c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I9f19aa9362ea592c8fc5ba028846d0a7edf90746 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE am: 4c0e43192bLinus Tufvesson
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505 Change-Id: I0f8e82ad59e55e4e019988a596c161fa52a9a00e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO ↵Linus Tufvesson
NOT MERGE" into sc-v2-dev am: f5aaf7019d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622 Change-Id: I4b09b0a6e6615393ad755e75fce564d327e81dfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01[automerger skipped] Allow windowhandles with NO_INPUT_CHANNEL - DO NOT ↵Linus Tufvesson
MERGE am: 8758cd1030 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622 Change-Id: Ib0fafa6359906880658fd5bc67f6525d1dfa376c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE am: c7df484a6fLinus Tufvesson
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504 Change-Id: I60323ba01a16be6a0c5258a5618db998f3c1b728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-v2-devLinus Tufvesson
2022-07-01Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-devLinus Tufvesson
2022-06-29Snap for 8783712 from ee4a62953e90edcc29e9b2c7fc6c3742b941d68c to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I83203845841c8a603de5bcfcacc1ee1a3884290d
2022-06-29[automerger skipped] Merge "Initialize DrawingState::trustedOverlay to false ↵Winson Chung
in constructor" into sc-dev am: 58a3381c4f -s ours am: 858f8bb561 -s ours am: 3d961418d4 -s ours am: bfb51bb9a2 -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: I1fede609f39e0bec9df98130a36c7a6cf8a481d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Initialize DrawingState::trustedOverlay to false in ↵Robin Lee
constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours am: ead70849bc -s ours am: 60972e9dff -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: I1c0ccdc9ad1d659f808ef6ee33e9555654d1dd99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge "Initialize DrawingState::trustedOverlay to false ↵Winson Chung
in constructor" into sc-dev am: 58a3381c4f -s ours am: d2c9d0517b -s ours am: 15fed65e27 -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: Ieb0a88aecb6f12e3ac376126185cacb4b314c311 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Initialize DrawingState::trustedOverlay to false in ↵Robin Lee
constructor am: b4a2d3a77a -s ours am: a939e7c71c -s ours am: 60476d1d11 -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: Id711a188d87df2926e2f4c26ed1180ff679bb24a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge "Initialize DrawingState::trustedOverlay to false ↵Winson Chung
in constructor" into sc-dev am: 58a3381c4f -s ours am: 858f8bb561 -s ours am: 3d961418d4 -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: I3821774ee2243cdfb22e4d41b87cee7b3b98e9d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Initialize DrawingState::trustedOverlay to false in ↵Robin Lee
constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours am: ead70849bc -s ours am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070 Change-Id: Ic7a117feac9f40a18928a86497b852311649b463 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-01 03:03:59 +0000