- Nov 01, 2023
-
-
Achim Thesmann authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813180 Change-Id: I087306e893643a2f59b889be6ecf4f4f2842fc0a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Achim Thesmann authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813180 Change-Id: If45b7f3bd6882ac38adad9d67f35f7570d9108c0 Signed-off-by:
-
Brad Ebinger authored
Merge "Modify docs to clarify rules around placing calls to CF MMI codes" into main am: a0b29244 am: 742f5c5f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013 Change-Id: I7f11d87ae51a454791318cc533a7fd9dd0e38690 Signed-off-by:
-
Achim Thesmann authored
-
Brad Ebinger authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013 Change-Id: If2b2e7d7ff1a4ce28b89cfc49820596ee7cfce04 Signed-off-by:
-
Brad Ebinger authored
Merge "Modify docs to clarify rules around placing calls to CF MMI codes" into main am: a0b29244 am: e9e474e8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013 Change-Id: I3b7bce763ae2370b75ffbf61da2d77044db9cc1f Signed-off-by:
-
Brad Ebinger authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013 Change-Id: Ib4be5414e2d4aa9cd3aae3b4ff830d533ce47075 Signed-off-by:
-
Brad Ebinger authored
-
Wale Ogunwale authored
[automerger skipped] Merge "Consume pending display config change with multiple remote callbacks" into udc-qpr-dev am: 33285cfb -s ours am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25201937 Change-Id: I7792749ccf4b25f5db6dafc251493fec25358678 Signed-off-by:
-
Riddle Hsu authored
[automerger skipped] Consume pending display config change with multiple remote callbacks am: c793afe3 -s ours am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25201937 Change-Id: I2c350d00ab77e11d721866fbc3fd522a46fec7ba Signed-off-by:
-
Wale Ogunwale authored
-
Eric Biggers authored
Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp am: aeadff89 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25176948 Change-Id: I3aae52efe951c551c4dceb3a24ac079a5d4b1de1 Signed-off-by:
-
Eric Biggers authored
-
Achim Thesmann authored
Change-Id: I34c02da253d8dcd6e360b7e3efb4c27daf58ba29 Test: owners update only Bug: 305115571
-
Treehugger Robot authored
[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into aosp-main-future am: aae44639 -s ours am skip reason: Merged-In I8cb92fd35b3633cf458f8692173124fd1666d6b5 with SHA-1 54342761 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25247638 Change-Id: Ifd39d55d2583f05f340e17722a615b5e92537c04 Signed-off-by:
-
Ian Baker authored
[automerger skipped] Cherry-pick MediaFrameworkTest dep changes from internal main am: 8637fb88 -s ours am skip reason: Merged-In I8cb92fd35b3633cf458f8692173124fd1666d6b5 with SHA-1 54342761 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25247638 Change-Id: I73f13b66296c683177624e052a50f91ab6ff1f47 Signed-off-by:
-
Treehugger Robot authored
-
Treehugger Robot authored
[automerger skipped] Merge "Implement filter-product" into main am: 0092cae0 am: 4520c6d3 -s ours am skip reason: Merged-In I42eb3e134c7aa120f6bbe2d26d311bd46b586595 with SHA-1 2738abbd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813934 Change-Id: Id4fcdb2fb267bb251c9b7adfd5a22a4d7a049f87 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813934 Change-Id: I3253def7221394cc8cbea94f7f268e5fa2afbc8c Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813934 Change-Id: I08e3e25ac26b83a9a635a29fa624e8351a49cfe9 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813934 Change-Id: I9d5419bcf9a682c73cd19ce6f20229337eedd565 Signed-off-by:
-
Anton Hansson authored
[automerger skipped] Merge "Dedupe build rules for non-updatable sdk libs" into main am: 7301cbe4 am: 544d75b7 -s ours am skip reason: Merged-In I5b596821ce9c20d2504728bf01f4fdd69da9a94e with SHA-1 14e7f959 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799596 Change-Id: I69025465a698129b879f260e63df3539b88d1a58 Signed-off-by:
-
Treehugger Robot authored
Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into udc-dev-plus-aosp am: 51087e6c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25235175 Change-Id: I0a44873e4ec5af23cbf2e5a142c7c761728cdeeb Signed-off-by:
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799596 Change-Id: I3fed88bb254006bac874576448f1f35a36beceed Signed-off-by:
-
Ian Baker authored
This resolves automerge conflicts in aosp/2745223 This is a manual cherry-pick of aosp/2796172 with different automerger tags (see comment: https://android-review.git.corp.google.com/c/platform/frameworks/base/+/2796172/comments/f84931d5_488e9082). Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest Bug: 298965955 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:54342761f0739a209d46938a0e956ab71c15d980) Merged-In: I8cb92fd35b3633cf458f8692173124fd1666d6b5 Change-Id: I8cb92fd35b3633cf458f8692173124fd1666d6b5
-
Treehugger Robot authored
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799596 Change-Id: Idaeda11c7c474384578537327bb5a2d0e34208c9 Signed-off-by:
-
Treehugger Robot authored
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799596 Change-Id: I38ff239f230b624571923ed90be7044b5976a43e Signed-off-by:
-
Anton Hansson authored
-
Louis Chang authored
Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am: 7a0fa2c8 am: cfd71092 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293 Change-Id: If700879db4b6434e90d3e2a266d457cfc973ebf4 Signed-off-by:
-
Louis Chang authored
Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am: 7a0fa2c8 am: 20d7df51 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293 Change-Id: Ice9c0615da45d07fef1ca07c57f65d5594aa9100 Signed-off-by:
-
Anton Hansson authored
Reuse the defaults in packages/modules/common that are for non-updatable (to be updatable), but extend them to be suitable for modules that have no intention of becoming updatable. Baseline issues that were not enabled previously. Bug: 306806877 Test: presubmit Merged-In: I5b596821ce9c20d2504728bf01f4fdd69da9a94e Change-Id: I5b596821ce9c20d2504728bf01f4fdd69da9a94e
-
Louis Chang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293 Change-Id: I07611397e7235709b0cbd9a825fefefd8df428a1 Signed-off-by:
-
Louis Chang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293 Change-Id: Ib8eddf6e15fe7a0f6fdf4e0d9ab0e699dbd4e0e5 Signed-off-by:
-
Louis Chang authored
-
Nan Wu authored
[automerger skipped] RESTRICT AUTOMERGE am: 5f12deec am: 0b29810e -s ours am: c24ce12b -s ours am: c94352e3 -s ours am: 944a0d9d -s ours am: 5e5e9db2 -s ours am: d6a48bb7 -s ours am: aa94ed98 -s ours am: 067e7f38 -s ours am: 40e4d6bc -s ours am: 64d58195 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25174238 Change-Id: Iae8f2c8803fee027836f467be3363265b8dd0d1e Signed-off-by:
-
Nan Wu authored
[automerger skipped] RESTRICT AUTOMERGE am: 5f12deec am: 0b29810e -s ours am: c24ce12b -s ours am: c94352e3 -s ours am: 944a0d9d -s ours am: 5e5e9db2 -s ours am: b5aeeec9 -s ours am: 5859c364 -s ours am: 9e9732e7 -s ours am: 4bd0db83 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25174238 Change-Id: Ia68067bc7138a844f967babf0cca2518c6df8978 Signed-off-by:
-
Sudheer Shanka authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813073 Change-Id: I5506f69866686c4c017cf6bcfd537035b5635958 Signed-off-by:
-
Nan Wu authored
[automerger skipped] RESTRICT AUTOMERGE am: 5f12deec am: 0b29810e -s ours am: c24ce12b -s ours am: c94352e3 -s ours am: 944a0d9d -s ours am: 5e5e9db2 -s ours am: d6a48bb7 -s ours am: aa94ed98 -s ours am: 067e7f38 -s ours am: eaa0f6ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25174238 Change-Id: I7786e5b6f01f5e3a29e93ad4036114ef82674613 Signed-off-by:
-
