- Oct 23, 2023
-
-
Maryam Dehaini authored
-
Dmitry Dementyev authored
-
Anushree Ganjam authored
-
Roshan Pius authored
Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0 am: 90e7909f am: 096034c7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: Ifdb5d7fc83c46b06115d6201755a8741d9528022 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0 am: bf481386 am: 228a3848 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: If4794e81d8658325a0b3c6fe65f8227bf564be7a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0 am: 90e7909f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: Ib9e17a40b824a9458a09e251584faace754c1b25 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: I364265d33fbc40261fd643acdfe0bf8771049e66 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0 am: bf481386 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: Ie490c0094aafbbd0c43dc26250c2172ea05c1af3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799358 Change-Id: I92fd5710044362c715b09c79ed2893e4a1f3a1dc Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
-
Alec Mouri authored
-
Jernej Virag authored
-
Chen Bai authored
-
Eric Biggers authored
Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main am: 5d339d0a am: 37ff905f am: 7ebaecf0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786390 Change-Id: Ib9b02453dc4ee144f84d03ffcb1bf1650278e4ef Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Eric Biggers authored
Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main am: 5d339d0a am: 37ff905f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786390 Change-Id: Ib3e6d6b4d7dbe4953102719f90dac0c9eb421dda Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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: I8c511427b185a7aab9afefb37ac6578159ee4ecc Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Maryam Dehaini authored
Currently, we are are passing in the surface control from the transition directly when we create a window decoration. This surface control is reused throughout the life cycle of the decoration; however, the surface control is released when a transition is finished which is causing an IllegalStateException. With this change, the window decoration will be passed a copy of the surface control which will only be released when the decoration is closed. Bug: 303160557 Test: manual testing Change-Id: I42eee8051386e4a661dabebdf6d21b26d6d01acf
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-