- Oct 05, 2023
-
-
Beth Thibodeau authored
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf7 am: 0776a21a -s ours am: 0062109f -s ours am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 470f62bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974 Change-Id: I93c8a23c983f80ff4f061fa712429ca44a3b092d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beth Thibodeau authored
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf7 am: 0776a21a -s ours am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 470f62bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974 Change-Id: I8b78ef007e78281b901b29155deab6bc53a4f5cc Signed-off-by:
-
Treehugger Robot authored
Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900 am: b569a0c5 am: c182dfe8 am: 23298d01 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646885 Change-Id: I99975514989844f5c450933e9ae1b2f8528448ef Signed-off-by:
-
Beth Thibodeau authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974 Change-Id: I7166ef956497863ba37b1a85b7da24f6eed7b587 Signed-off-by:
-
Beth Thibodeau authored
-
Treehugger Robot authored
Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900 am: b569a0c5 am: c182dfe8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646885 Change-Id: I140cdbd93fda55688cc71fd7da799d553284f31d Signed-off-by:
-
Treehugger Robot authored
Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900 am: b569a0c5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646885 Change-Id: If743e786ffcbd2cbcf4b4a81cf485dc143e907dd Signed-off-by:
-
Treehugger Robot authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24920837 Change-Id: I48b5db07425514bc3511ad68705d49ccfa8376b5 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6a9b7d2e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24948749 Change-Id: I7667e3a120b24530a353b130e45f2a016f2efd26 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/+/24948749 Change-Id: I1bba890e7fecf40ebf2c564d0d520b53f71c3263 Signed-off-by:
-
Bill Yi authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: fcdc4471 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24948072 Change-Id: I8448f18d7f732c226f1420cbdfb9d34860bcba8f 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/+/24948072 Change-Id: I75be102a4379bebcd6956075fd711d0f1419d94b Signed-off-by:
-
Treehugger Robot authored
-
Treehugger Robot authored
Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646885 Change-Id: I75842c7097aaf25a28aa83a348672566ffc64f19 Signed-off-by:
-
Bill Yi authored
-
Bill Yi authored
-
Treehugger Robot authored
-
Winson Chung authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24944244 Change-Id: I1d0404ea378b580e89fc859fd8f3f1e65ecd7c4e Signed-off-by:
-
Winson Chung authored
-
Winson Chung authored
- RotationPolicy (a fw helper class) uses the current user to resolve the system setting for whether rotation is currently locked. However, Launcher uses this class and does not hold the INTERACT_ACROSS_USERS permission, which means that immediately following a user switch, there is a brief window between ActivityManager setting the current user and Launcher being notified that the user is changing (so it can unregister the rotation watcher). In this brief window, the Launcher for the outgoing user receiving a rotation signal will try to call this check and fail with a SecurityException. Longer term, we should refactor this to support a non-current user path for Launcher. Bug: 279561841 Test: Manual Merged-In: I7ce869d8388081af53751226b22f018d45ec2de8 Change-Id: I7ce869d8388081af53751226b22f018d45ec2de8
-
Bill Yi authored
Auto-generated-cl: translation import Change-Id: I85b389886f58789b5b71d6112f69df760b08a3f1
-
Bill Yi authored
Auto-generated-cl: translation import Change-Id: I64ae40c5338fab7e19ff0fe3b54e87eeb4d06c59
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: 9b4ab43d -s ours am: 0b5a34c2 -s ours am: 896c255a -s ours am: 912d2a7b -s ours am: bc0c162c -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Ibe98325f5990a50d91f6b6729647e7c1263ca1b1 Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 81c628fc -s ours" into udc-d1-dev-plus-aosp am: 34539a4d -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 35a6e2f2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I8fd642df14e82d77ed518e85d6991f1da2711b53 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 81c628fc -s ours am: ac115aa9 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I9641878285b6612622a30a508eb4b423f1d46ec5 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: 9b4ab43d -s ours am: 0b5a34c2 -s ours am: 896c255a -s ours am: e80ef17e -s ours am: ddaa1aac -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Ie97476907270509acf2f567c90658b60ba962f3b Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: a7ed76fe -s ours am: f92f9ce2 -s ours am: 68f052cc -s ours" into udc-d1-dev-plus-aosp am: 4eb2d853 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 35a6e2f2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: I85e05fb774ae4a3e7775acc09fb36dcfb869234d Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: a7ed76fe -s ours am: f92f9ce2 -s ours am: 68f052cc -s ours am: 36563891 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: I2fe042b50d54a07cae1c4b1535cff2388e50dd37 Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: 9b4ab43d -s ours am: 0b5a34c2 -s ours am: 896c255a -s ours am: e80ef17e -s ours am: faa64de7 -s ours" into udc-qpr-dev-plus-aosp
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: 9b4ab43d -s ours am: 0b5a34c2 -s ours am: 896c255a -s ours am: e80ef17e -s ours am: faa64de7 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: I8b8d7ac696f71297072850cea7e572ec3ecfd5a7 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 8ca3fb34 -s ours am: 46278f1a -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I4a3ef98ae06b23de7b2ab7b4fa9524360982aa63 Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 8ca3fb34 -s ours am: d4527635 -s ours" into udc-qpr-dev-plus-aosp
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 8ca3fb34 -s ours am: d4527635 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I5c8e82477d50f1b92ab317cbe66554c8514a2d41 Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: a7ed76fe -s ours am: f92f9ce2 -s ours am: b7324d59 -s ours" into udc-d1-dev-plus-aosp am: 964f97d2 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: I145be12e48b095ed7b05bcdc82a8b7e6b96452a3 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: a7ed76fe -s ours am: f92f9ce2 -s ours am: b7324d59 -s ours am: 728e6dae -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Ie1eda6a97e71eb4d16ca0f07dd94c37aee1ef4c6 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 am: ae62a32d -s ours am: 5200fce0 -s ours am: ad73da7f -s ours am: a7ed76fe -s ours am: f92f9ce2 -s ours am: b7324d59 -s ours am: 0068e274 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Iaf8588e19e259f27b51b454bbed776db6e2ed623 Signed-off-by:
-
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 1efe53e8 -s ours am: 61ecdb33 -s ours am: 75564c4c -s ours am: 433f7bb0 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: Ib795c53e4faf8d09ac3549b6d0f50ef66de94901 Signed-off-by:
-
-
Treehugger Robot authored
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 1efe53e8 -s ours am: 61ecdb33 -s ours am: 52a67045 -s ours am: ae5f04b5 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: Ib8523a44d40ab33e1dec10ee255bf6a871ce664d Signed-off-by:
-
