- Oct 23, 2023
-
-
Eric Biggers authored
Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main am: 5d339d0a am: feff9b27 am: c47b8052 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786390 Change-Id: I2616137b3e0427adef983957686d01db6419440c Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Behnam Heydarshahi authored
[automerger skipped] Ignore VolumeDialogImplTest class am: 6bd7e33a am: 8e963633 -s ours am: 77589ba0 -s ours am: 0da6cdbc -s ours am skip reason: Merged-In I0677b6b6ab958dc9939f55851c00dc67d32b828d with SHA-1 9f5a33af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119843 Change-Id: I9ee18672a700840e48976e1da184b85ab98f6cbf Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c428537d -s ours am: 9001f542 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127248 Change-Id: I426479116d11b6daa2566b311b46cc62ba10e94d Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29738707 -s ours am: 8fb2bfbd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127248 Change-Id: Id2f3f41c5f66066e7940b7e6bd8e2d3dc7ea5316 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e56aecb3 -s ours am: 40ac9f8c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25126825 Change-Id: I1bc92c95c1f9aebb0d525614885ab7627ef4032c Signed-off-by:
-
Bill Yi authored
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b96843b -s ours am: a1a15f47 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25126825 Change-Id: Ib93e4390ce70f852148b1c60622d5cf56a522e68 Signed-off-by:
-
Eric Biggers authored
Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main am: 5d339d0a am: feff9b27 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786390 Change-Id: I317aff63bc9b23aecab5c3f60665145539358350 Signed-off-by:
-
Iván Budnik authored
-
Yeabkal Wubshit authored
Merge changes from topics "scroll_feedback_api_updates_2", "scroll_feedback_api_updates_3" into main * changes: Hide haptic feedback ViewConfiguration APIs Create default ScrollFeedbackProvider creator
-
Behnam Heydarshahi authored
[automerger skipped] Ignore VolumeDialogImplTest class am: 6bd7e33a am: 8e963633 -s ours am: 77589ba0 -s ours am skip reason: Merged-In I0677b6b6ab958dc9939f55851c00dc67d32b828d with SHA-1 9f5a33af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119843 Change-Id: Ia597b7710084936ed73c38d95b568881ac6966d1 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c428537d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127248 Change-Id: I8cb8b8ea48bfac6fc6b4587d3de78f27cd94fc54 Signed-off-by:
-
Bill Yi authored
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127248 Change-Id: Ia4413df4b8a39ec77ed7336a0d41a5db52266a79 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e56aecb3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25126825 Change-Id: I9c10504e66703fb8ca544064cd207a31d23b032b Signed-off-by:
-
Bill Yi authored
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25126825 Change-Id: I46c70f0fc662213afccbbc1f22e93407d2b10756 Signed-off-by:
-
Alex Mitra authored
-
Eric Biggers authored
Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main am: 5d339d0a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786390 Change-Id: Ia5dff61fa38608d660ff69342abc4d638c1c3b00 Signed-off-by:
-
Behnam Heydarshahi authored
am skip reason: Merged-In I0677b6b6ab958dc9939f55851c00dc67d32b828d with SHA-1 9f5a33af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119843 Change-Id: Iea5693b31b70b07c3a12e6d6b70e8bf5537c13b5 Signed-off-by:
-
Sally Qi authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 2e73062e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127246 Change-Id: Ia87ec7e8b2c768ec8b53c0376c841f0888dc3864 Signed-off-by:
-
Bill Yi authored
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25127246 Change-Id: I2dd73efa4ea268f7ff86d4405039524cccdb07f3 Signed-off-by:
-
Behnam Heydarshahi authored
am skip reason: Merged-In I0677b6b6ab958dc9939f55851c00dc67d32b828d with SHA-1 9f5a33af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119843 Change-Id: Ieb9fd8120c7519afb4b96f91383d4a5512671f7a Signed-off-by:
-
Eric Biggers authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
-
Bill Yi authored
-
Behnam Heydarshahi authored
[automerger skipped] Ignore VolumeDialogImplTest class am: 6bd7e33a am: ce26825f -s ours am: 663afcb4 -s ours am skip reason: Merged-In I0677b6b6ab958dc9939f55851c00dc67d32b828d with SHA-1 9f5a33af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119843 Change-Id: Idfbdef7e92363c372adfa6d916d7421c7ac913e8 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799357 Change-Id: I3ca67ef9d3641a09dad21c84052b49bebd49c2e7 Signed-off-by:
-
Bill Yi authored
-
Sumedh Sen authored
[automerger skipped] Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321" into main am: bfc1c042 am: c8ca6920 -s ours am: f4d38451 -s ours am skip reason: Merged-In I94f5a9a4313c13375062fdade0e672d51eb5dc55 with SHA-1 99396a46 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798517 Change-Id: I4e17edd63dda8c5e54fd4cda369afecb9fb034d0 Signed-off-by:
-
Sumedh Sen authored
[automerger skipped] Resize large app icons before adding them in a parcel am: df3af7fd am: 3c3aab14 -s ours am: 28884b7c -s ours am skip reason: Merged-In I5feafea491208c8fd6bbdc6b2b655d46b6964d95 with SHA-1 df3af7fd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798385 Change-Id: I85df11794146d58f04ed4b2c1a43c50b86f5b0fa Signed-off-by:
-
Sumedh Sen authored
[automerger skipped] Make AppSnippet parcelable am: c1647930 am: 43ca9b0c -s ours am: b2f40863 -s ours am skip reason: Merged-In I2095b092e1a7b3186ff4cdc4c81effce51377b19 with SHA-1 0b95ed68 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798516 Change-Id: Ia11808020587e629e152899a033fb38c0cad1d26 Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799357 Change-Id: I253f4b501ef5c6b75599ff16caf9c305d6718d0c Signed-off-by:
-
Automerger Merge Worker authored
Merge changes from topic "am-70d1989cf78d41b9aa386b30d2279168" into udc-qpr-dev-plus-aosp am: 1664a8fd -s ours am skip reason: Merged-In I94f5a9a4313c13375062fdade0e672d51eb5dc55 with SHA-1 74d9576b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798517 Change-Id: Ibe3e6d62b3e5e94edbab8d2b34393b40975d809d Signed-off-by:
-
Sumedh Sen authored
[automerger skipped] Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321" into main am: bfc1c042 am: ce2ef4ec am: 686564b4 -s ours am skip reason: Merged-In I94f5a9a4313c13375062fdade0e672d51eb5dc55 with SHA-1 74d9576b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798517 Change-Id: I30454b256cdb29a1340885b787a31d9d9b275726 Signed-off-by:
-
