- Oct 13, 2023
-
-
Matt Buckley authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25032861 Change-Id: Ice8f504512c04b1295a125d7a5198f2a93f9b8fd Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
John Stiles authored
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42 am: 2cce29e6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I4a5ce5487fe24d1d2f34ec0f386a0f55a69427d9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Peiyong Lin authored
[automerger skipped] Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60 am: 58ab4b3e -s ours am skip reason: Merged-In I91f59c17100ac43ee8eea4f3fa8c86602c26a416 with SHA-1 b27fecd0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I0fb17e32bab148ca31495ee4735ec6120ffc30b6 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Matt Buckley authored
Revert submission 24828717 Reason for revert: performance concerns Reverted changes: /q/submissionid:24828717 Bug: 300360668 Bug: 302620048 Change-Id: Iefb7488f6e100ca7cbb0d43337e5830860ebebe5
-
John Stiles authored
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: Ia8641e789c625fd55c50783bb9dbcf3ba5c90b73 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Peiyong Lin authored
Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I4fce8a8246b236d07faa61172122518706e731e7 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 am: 028f33fd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: I4212f5f54fc0613ab8e6cd14f334557a3a5821f1 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 am: 99b6b234 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: I112486ff1d18be16a5e03362bf3371e9c34d45bf Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shunkai Yao authored
Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 am: 2b8ba491 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: Ida6f4c4e799ba009550958708a91331e0f99825e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Olivier Gaillard authored
Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda am: 0e75a926 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: Id564c2f275439ea2d6cc8b90f7314435f959a36a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
John Stiles authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I45deb21cc081f0d0853692685ad036138828fe5d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Peiyong Lin authored
Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: I6d9cdb4571a9de6ffada5f36cc271d87e9d0a2e6 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e am: e5315e34 am: 3c971c3b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I734039ab5c0b95efd2f886ce14ca25f58dad3710 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
John Stiles authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: I7a975e917be21494006bc7a9de71ee46d520902c Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
John Stiles authored
-
Jiakai Zhang authored
Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: I338fc316172c608954f0b9aa58967ef11b766460 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: I1de12add26c3aad75ff214e787ed97c4872c26a9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shunkai Yao authored
Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: I0fe67bc176d540ec3cff7021241935d34b9c74c0 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Olivier Gaillard authored
Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: I261e362aed917eec7bde42cb712a36046006fef6 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e am: e5315e34 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I5e56adb7ca84ae2e3cfd5b02f56e71c9303e0d55 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Peiyong Lin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747 Change-Id: Ic9fa91dbf4d22c0310ce482dbb0f8bd718ad858f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: If032da35feb70086cde2b69d80ae56cbb5c1a805 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: Ied817ae91df1b9b6ce4b541e2210075f3e2c4b38 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: I3deafd04643360a9be4f58ececfc4dd022eaaa27 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Olivier Gaillard authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: I83d6bc4636517ab4df14f87e756be603cff6ebe3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I9d6588b32eabf3aa0fb584686c2c818488ed00ef Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Peiyong Lin authored
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786343 Change-Id: Ifa1847506ffcbe523f8901c1e7af565b8ac7e2ae Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786681 Change-Id: Icb64a67b8703d167494dd5090d30b5c3dcb9f638 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shunkai Yao authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787114 Change-Id: I115813124ae619dd407027a17c40977a4531cd87 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Olivier Gaillard authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758848 Change-Id: Ic2cd6a01fdeda66585a08bc674c3b76e4b194198 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Robin Lee authored
Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750502 Change-Id: I70e5ed915547d8c99defc85214091cabea388b67 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jiakai Zhang authored
* changes: Revert^2 "Propagate external profile errors for `adb insta..." Revert^2 "Fail adb install on external profile errors."
-
Shunkai Yao authored
-
Olivier Gaillard authored
-
Robin Lee authored
-
John Stiles authored
We were shadowing the `turbulence` function with a variable of the same name. This isn't illegal, but it is not a good idea to do this. Renamed the variable to `turb`. Change-Id: Ic2046d2ffe507f03e53a947a884114dd660b143e
-
Treehugger Robot authored
Merge "Call exit instead of _exit when compiled with clang coverage" into main am: 0c175e28 am: fa58b4a9 am: 32df7715 am: 79dc06e4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780904 Change-Id: Ic1b09836634136b1cd070fd1832232e0b95488f2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Merge "Call exit instead of _exit when compiled with clang coverage" into main am: 0c175e28 am: fa58b4a9 am: 32df7715 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780904 Change-Id: I46ece9c92d609bcf61b9bd0dc539b48ca9b658df Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Merge "Call exit instead of _exit when compiled with clang coverage" into main am: 0c175e28 am: fa58b4a9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780904 Change-Id: I1e358413a94961e50576203d324979abf8fb6b4a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-