- Feb 27, 2024
-
-
Vaibhav Devmurari authored
am skip reason: Merged-In Id96d86242ab239c7df0efe74bf13fb97eb97f482 with SHA-1 03a1658c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977552 Change-Id: I1ec337bbce8b8755ef45737e1f6da62f1f4ee83f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Asmita Poddar authored
am skip reason: Merged-In Id96d86242ab239c7df0efe74bf13fb97eb97f482 with SHA-1 03a1658c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977552 Change-Id: Id4e48baffee8ea222a8c10f9fd7d140e1974e761 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Harshit Mahajan authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977292 Change-Id: Iba1ecd034ca492ef0f55a43a66f346a46043c09f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jean-François Geyelin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967634 Change-Id: If87bca8e5b14902117a11cd0987f4549f31098a2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main am: c99012b6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977531 Change-Id: I26ad96fd2fac533dfcc9e284ca4d0de0b2f5bc75 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kangping Dong authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2966947 Change-Id: Idfe70a057ba0479ad5f4c085829c51debfd8f3d2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Zi Wang authored
[automerger skipped] Merge "Add jarjar_prefix to framework-minus-apex" into main am: 8095041d -s ours am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970331 Change-Id: Ia7a0a7817a7ff37cc687b9263d71caa1441791c9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Zi Wang authored
am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970331 Change-Id: I55d9f942eb45187fdd5bfe90243f79febc48765a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Zi Wang authored
[automerger skipped] Merge "Revert "Add jarjar_prefix to framework-minus-apex"" into main am: 9f5f7378 -s ours am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212 Change-Id: I79461835ea9b76e7c4750e592f0fafdff0e1795f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Zi Wang authored
am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212 Change-Id: Idd1bec60842ee958294eddfb27162312478decc8 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Candice Lo authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2971614 Change-Id: I37c3b716f5e39531ac45ce4cd0d53983e99f45fe Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
T.J. Mercier authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977631 Change-Id: I6c067ef3ea5e7b680e0dc64d6e209b3524c7fcf1 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2941325 Change-Id: I0dfa89d4576e8b0a56d9c6a51f29f34501a051ff Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Merge "Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3" into aosp-main-future
-
Beth Thibodeau authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2973731 Change-Id: I696ecc63ea8004c37743cc4a3a41c506bbd2a833 Merged-In: I22553d0b76b4b8b3decd90a38368ba5b53acc405 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Paul Duffin authored
The `Notification.Style` class is an abstract class with a publicly visible constructor and so the assumption is it is expected to be extended by Apps. As such it cannot have any hidden abstract methods as that would prevent an App from extending the class. Unfortunately, `areNotificationsVisiblyDifferent(Style)` is both hidden and abstract. The issue was not previously detected due to a bug in Metalava but that has been fixed and so now this is an issue. This change is temporarily suppressing the error in the code to unblock Metalava changes being merged into AOSP but it should be fixed properly ASAP. A proper fix would either require marking the public constructor as `@removed` or unhiding the method or giving it a concrete implementation. Bug: 324468829 Test: m checkapi android-non-updatable-doc-stubs (cherry picked from https://android-review.googlesource.com/q/commit:ddc69d098f03fce1bed20144f92b8743eddb1767) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:57f1c4e1e85a4593ec596af264cd644e2130a6cb) Merged-In: I3b72ef4f0afff35771ee6f37130d1084071e2de1 Change-Id: I3b72ef4f0afff35771ee6f37130d1084071e2de1
-
Vaibhav Devmurari authored
-
Harshit Mahajan authored
-
Jean-François Geyelin authored
-
Treehugger Robot authored
Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main
-
Kangping Dong authored
-
Zi Wang authored
-
Zi Wang authored
-
Candice Lo authored
-
T.J. Mercier authored
-
- Feb 26, 2024
-
-
T.J. Mercier authored
Otherwise system_server incorrectly shows up in the uid_0 (root) cgroup in the v2 hierarchy. Change-Id: I6123b649dabd8c752e527c776d611f5899abfe2c Bug: 326301963
-
Treehugger Robot authored
-
Beth Thibodeau authored
-
Harry Cutts authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2965342 Change-Id: Ice2c795ecde17d96abff28e1dda9126cb953d9b7 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Asmita Poddar authored
Since the same vendor ID could mean different vendors depending on whether the device is connected over bluetooth or USB, we require to know the device bus to disambiguate the vendor IDs. Also fixed some formatting issues. Bug: 308918242 Test: atest InputTests:KeyboardMetricsCollectorTests Test: atest ShortcutLoggingTests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:03a1658c6dbfadfeb57a408aa9fcfbdc5213a740) Merged-In: Id96d86242ab239c7df0efe74bf13fb97eb97f482 Change-Id: Id96d86242ab239c7df0efe74bf13fb97eb97f482 NOTE FOR REVIEWERS - errors occurred while applying the patch. PLEASE REVIEW CAREFULLY. Errors: Error applying patch in services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java, hunk HunkHeader[30,13->30,13]: Hunk cannot be applied Error applying patch in services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java, hunk HunkHeader[483,10->483,15]: Hunk cannot be applied Error applying patch in tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt: Cannot perform UNIFIED action on a non-existent file Error applying patch in tests/Input/src/com/android/server/input/KeyboardMetricsCollectorTests.kt: Cannot perform UNIFIED action on a non-existent file Original patch: From 03a1658c Mon Sep 17 00:00:00 2001 From: Asmita Poddar <asmitapoddar@google.com> Date: Mon, 27 Nov 2023 17:03:03 +0000 Subject: [PATCH] Log device bus for keyboard metrics Since the same vendor ID could mean different vendors depending on whether the device is connected over bluetooth or USB, we require to know the device bus to disambiguate the vendor IDs. Also fixed some formatting issues. Bug: 308918242 Test: atest InputTests:KeyboardMetricsCollectorTests Test: atest ShortcutLoggingTests Change-Id: Id96d86242ab239c7df0efe74bf13fb97eb97f482 ---
-
Harry Cutts authored
-
Jean-François authored
Bug: 206676167 Test: m Change-Id: I914366f6cef19df5f528bb0a43b51d17b50ca1ae
-
Harshit Mahajan authored
Need to use the BackgroundThread from modules-utils-backgroundthread only after we move to the CrashRecovery module. But till the time we ramp up the flag, we cannot use it directly. Copying BackgroundThread to local utils for now. Added a TODO to move it later. Bug: b/289203818 Test: atest PackageWatchdogTest:com.android.server.PackageWatchdogTest Change-Id: I40b919bbe7a410eab48d099e30e5c54095731cac
-
Jean-François Geyelin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957974 Change-Id: I2a8f153a8fb24c4d2f202b963c5c7394d642311a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jean-François Geyelin authored
-
Paul Duffin authored
The `Notification.Style` class is an abstract class with a publicly visible constructor and so the assumption is it is expected to be extended by Apps. As such it cannot have any hidden abstract methods as that would prevent an App from extending the class. Unfortunately, `areNotificationsVisiblyDifferent(Style)` is both hidden and abstract. The issue was not previously detected due to a bug in Metalava but that has been fixed and so now this is an issue. This change is temporarily suppressing the error in the code to unblock Metalava changes being merged into AOSP but it should be fixed properly ASAP. A proper fix would either require marking the public constructor as `@removed` or unhiding the method or giving it a concrete implementation. Bug: 324468829 Test: m checkapi android-non-updatable-doc-stubs Change-Id: I3b72ef4f0afff35771ee6f37130d1084071e2de1
-
Harry Cutts authored
It makes sense to make people in INPUT_OWNERS owners of the file itself. Bug: none Test: none Change-Id: Ia3fdfd4bb7a009abf8e9e17e37756987cd343ea8
-
Suprabh Shukla authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2976055 Change-Id: I5558f57e0fe96b63c5d75609dc7eb7a3cd683f19 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Suprabh Shukla authored
-