- Feb 27, 2024
-
-
Zi Wang authored
[automerger skipped] Add jarjar_prefix to framework-minus-apex am: fd4df1c1 -s ours am: db03526d -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: I5d35875a26a6d667d7dff8884668fb0dd1e33a1e 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: 11070527 -s ours am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212 Change-Id: I7f9025b07813b94f1cff5ee62d0877051ae96c66 Signed-off-by:
-
Zi Wang authored
[automerger skipped] Revert "Add jarjar_prefix to framework-minus-apex" am: 0454b811 -s ours am: 9b70b232 -s ours am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212 Change-Id: I45b665cd0e474beb1cd4ddb0ee70426c58f54974 Signed-off-by:
-
Candice Lo authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2971614 Change-Id: I585c4fdac4b2cbd366521decc17b2eee409c5d1c Signed-off-by:
-
T.J. Mercier authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977631 Change-Id: I4767b09468a65bab57586ce44a3e24f772c5067e Signed-off-by:
-
Treehugger Robot authored
Merge "Update WindowManager OWNERS under core/java/android/view" into main am: 99965ff0 am: e5fbd8e4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2941325 Change-Id: Iadd5685c0c23d937e71daee6b5eac6f0ba92d73e Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3" into aosp-main-future am: 2c5cda8b -s ours am skip reason: Merged-In I22553d0b76b4b8b3decd90a38368ba5b53acc405 with SHA-1 560c97e1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26367324 Change-Id: I2f9600698c5e3dc87c16d89e53032d8faaca5984 Signed-off-by:
-
Beth Thibodeau authored
[automerger skipped] Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3 am: 3c9a543d -s ours am skip reason: Merged-In I22553d0b76b4b8b3decd90a38368ba5b53acc405 with SHA-1 560c97e1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26367324 Change-Id: I7e722efc4ff833a6eefdb0d653f534c2b96b0be1 Signed-off-by:
-
Winson Chung authored
-
Schneider Victor-tulias authored
-
Treehugger Robot authored
-
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:
-
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:
-
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:
-
Candice Lo authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2971614 Change-Id: I37c3b716f5e39531ac45ce4cd0d53983e99f45fe Signed-off-by:
-
T.J. Mercier authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977631 Change-Id: I6c067ef3ea5e7b680e0dc64d6e209b3524c7fcf1 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2941325 Change-Id: I0dfa89d4576e8b0a56d9c6a51f29f34501a051ff Signed-off-by:
-
Todd Lee authored
-
Treehugger Robot authored
Merge "Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3" into aosp-main-future
-
Lucas Silva authored
-
William Loh authored
-
Lucas Silva authored
-
Zi Wang authored
-
Carmen Jackson authored
-
Sherry Zhou authored
-
Reema Bajwa authored
-
Simon Wingrove authored
-
Sergei Makarov authored
-
Rambo Wang authored
-
Ted Bauer authored
-
Paul Duffin authored
[automerger skipped] Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent am: 52878196 -s ours am skip reason: Merged-In I3b72ef4f0afff35771ee6f37130d1084071e2de1 with SHA-1 7db8b595 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26382897 Change-Id: Ia9a09ef6912cd07761332ef977372c223b86acb6 Signed-off-by:
-
Makoto Onuki authored
-
Prabir Pradhan authored
-
Prabir Pradhan authored
-
Beth Thibodeau authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2973731 Change-Id: I696ecc63ea8004c37743cc4a3a41c506bbd2a833 Merged-In: I22553d0b76b4b8b3decd90a38368ba5b53acc405 Signed-off-by:
-
Sorin Basca authored
-
Paul Duffin authored
[automerger skipped] Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent am: 7db8b595 -s ours am skip reason: Merged-In I3b72ef4f0afff35771ee6f37130d1084071e2de1 with SHA-1 57f1c4e1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26379910 Change-Id: I7da18d61495df2e90a17777bea669d0b5ccd6f2b Signed-off-by:
-
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
-
Paul Duffin authored
Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main
-
Siarhei Vishniakou authored
-
