- Oct 06, 2023
-
-
Beth Thibodeau authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6 -s ours am: e4b9774b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: Ieca561eccad2969c627e72d379ad0644ea551028 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beth Thibodeau authored
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee3 -s ours am: f9cc4326 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I652f91f0e34064e396ba676815defa3fb9023504 Signed-off-by:
-
Beth Thibodeau authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: Id1f6fc7caddb0292cf543bef5b68edbbcd88e199 Signed-off-by:
-
Beth Thibodeau authored
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: Ia1821d581e73e63d885f19c12e77ea844f0b78ab Signed-off-by:
-
Beth Thibodeau authored
-
Beth Thibodeau authored
When resumable media is added that has artwork set via URI, check the permissions for the URI before attempting to load it Test: atest MediaDataManagerTest UriGrantsManagerServiceTest Test: manual with test app Bug: 284297452 Change-Id: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 Merged-In: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3
-
- Oct 05, 2023
-
-
Atneya Nair authored
[automerger skipped] Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db am: 5514a571 am: 2d2e7fd1 -s ours am: 76926dd4 -s ours am skip reason: Merged-In I54eefca5f0aa4f924debc1817b04a103b6e8e2e6 with SHA-1 3dddd6bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465294 Change-Id: I7c4511c9bdb82b09382c0622277a66a083fdbccb Signed-off-by:
-
Atneya Nair authored
[automerger skipped] Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db am: 5514a571 am: 2d2e7fd1 -s ours am skip reason: Merged-In I54eefca5f0aa4f924debc1817b04a103b6e8e2e6 with SHA-1 3dddd6bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465294 Change-Id: Id4e31b0f344f6e7924b44ea5b1b209abed839ba4 Signed-off-by:
-
Atneya Nair authored
Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db am: 5514a571 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465294 Change-Id: Id9c5f868fc92b14b3f10a2d7d66a76a3296c592f Signed-off-by:
-
Atneya Nair authored
Merge "Move startWatchingModeWithFlags to the native supported binder calls" into sc-dev am: 54ae55db Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465294 Change-Id: Ib59c6a98d1a706df9565f6b484bdeb695271a890 Signed-off-by:
-
Atneya Nair authored
Merge "Move startWatchingModeWithFlags to the native supported binder calls" into tm-dev am: ec8979da Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22465041 Change-Id: I02a28aea6eda09dc99bfebd1d69e0786ee38197b Signed-off-by:
-
Atneya Nair authored
-
Atneya Nair authored
-
- Oct 04, 2023
-
-
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 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: I464dfcdcf3a6d790bd0c8e01a113e10bc3d079d6 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 skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I220cadecfbf921096a0c8f66ef290541339257df 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 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: I0c46781075fd0e08b4413a59304b722a72a59de3 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 skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I1e8d5a1697e6095fc260c2456a195a5f33258fc8 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 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: Ifbb4fcb9c7225460ba337e2490c311c90e092945 Signed-off-by:
-
Treehugger Robot authored
Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Ief8cb81eea2d7f2402bfa20de3abab9d9ab2a75b Signed-off-by:
-
Treehugger Robot authored
Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Ida4524f47e4d590a643b2fd6e753988bd1340f53 Signed-off-by:
-
Treehugger Robot authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Id2b4f9656cad815cb7a94d6fdacd0dc6c50013f3 Signed-off-by:
-
Treehugger Robot authored
-
Treehugger Robot authored
-
Kunal Malhotra authored
Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 am: 868bc803 am: 264a36f6 am: 632a8b8a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: Ibf4efed382f979ced48f7fda9335344faa36472b Signed-off-by:
-
Kunal Malhotra authored
Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 am: 868bc803 am: 264a36f6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: Iaf567db3c1f6f7a2e2f154efbeeefe259fb2e342 Signed-off-by:
-
Kunal Malhotra authored
Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 am: 868bc803 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: I6637c61799e63de1ffe9e805dd99b28c65bb70dd Signed-off-by:
-
Kunal Malhotra authored
Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: Ibb59b8e6a61f60ddf4c45ebece8814a82fc89fdf Signed-off-by:
-
Kunal Malhotra authored
Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: If1714cbfb29550144f9bd663baf2504290a2c71b Signed-off-by:
-
- Oct 03, 2023
-
-
Kunal Malhotra authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898 Change-Id: Iea462e7f2dbeaa3e448cb3da33e5ad8684041495 Signed-off-by:
-
Kunal Malhotra authored
-
Beverly Tai authored
Additionally, don't hide keyguard when it's disabled if the user has locked down the device. Manual test steps: 1. Enable app pinning and disable "Ask for PIN before unpinning" setting 2. Pin an app (ie: Settings) 3. Lockdown from the power menu 4. Observe: user is brought to the keyguard, primary auth is required to enter the device. => After entering correct credential, the device is still in app pinning mode. => After entering an incorrect credential, the keyguard remains showing and the user can attempt again up to the limit Bug: 300463732 Bug: 218495634 Test: atest KeyguardViewMediatorTest Test: manual Change-Id: I70fdae80f717712b3dfc9df54b9649959b4bb8f0 Merged-In: I70fdae80f717712b3dfc9df54b9649959b4bb8f0 -
Beverly Tai authored
Additionally, don't hide keyguard when it's disabled if the user has locked down the device. Manual test steps: 1. Enable app pinning and disable "Ask for PIN before unpinning" setting 2. Pin an app (ie: Settings) 3. Lockdown from the power menu 4. Observe: user is brought to the keyguard, primary auth is required to enter the device. => After entering correct credential, the device is still in app pinning mode. => After entering an incorrect credential, the keyguard remains showing and the user can attempt again up to the limit Bug: 300463732 Bug: 218495634 Test: atest KeyguardViewMediatorTest Test: manual Change-Id: I70fdae80f717712b3dfc9df54b9649959b4bb8f0 Merged-In: I70fdae80f717712b3dfc9df54b9649959b4bb8f0 -
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: Ic5beb18ec273d55404e8e75de2df4110778a9842 Signed-off-by:
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: I86a5af217fdec364b05c4d3676fef3dbab9ac3dc Signed-off-by:
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: Ic99da6eb6de91c04d81f300ffc1db4b9a688f5e4 Signed-off-by:
-
Beverly Tai authored
Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: If7d9943b1dc2ffe6fc6aa0fb2fb23b2a05e8bf9e Signed-off-by:
-
Beverly Tai authored
Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: If176fab43b161223f7e4a24e2a0060237b046ab8 Signed-off-by:
-
Beverly Tai authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: I7753a5e784502b873ef2a6e34b7a5db783d6b23e Signed-off-by:
-
Beverly Tai authored
-
Beverly Tai authored
This reverts commit b23c2d5f. Reason for revert: b/300463732 regression Bug: 300463732 Bug: 218495634 Change-Id: I31485d0d8caa3060e998636b071dbe03f6b4fc82 Merged-In: Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 Merged-In: I314e5615b798487d9a965eaa0937905b65aa85fc Merged-In: I31485d0d8caa3060e998636b071dbe03f6b4fc82
-
