- 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: Idcf2b1f3692c26c4ebac018cc6807b17e80dc9f7 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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: Idcf12e919e485f8ba98fb50f7df2fe32eb75b60c 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: I83806e724aee5862d5ccabe86252a87e35163f1f 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: I9ac20df7c2e08707fdecc0bea1d84a95ae2e03fd 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
-
- Oct 02, 2023
-
-
Pinyao Ting authored
Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c am: 782e7bc3 am: 4a0b42a7 am: 63fe378e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: I1867710778e43594ea85a8c41323322e68620012 Signed-off-by:
-
Pinyao Ting authored
Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c am: 782e7bc3 am: 4a0b42a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: I671f3f0094151896deef83e23b42088c007de388 Signed-off-by:
-
Pinyao Ting authored
Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c am: 782e7bc3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Ic2c93fd09858955fd7cdd6372204fb60de208566 Signed-off-by:
-
Pinyao Ting authored
Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Ia7a01cb75d9fea08186e37fc71db16531a2f00d2 Signed-off-by:
-
Pinyao Ting authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Ib5bb11fae61b8a92bd3012984a2b67655e3caede Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59a -s ours am: 3815edc6 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I0d8fb3bb501396c983bbeb7508a4fd4f060d4fc9 Signed-off-by:
-
Beverly Tai authored
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e6 -s ours am: 12913fd3 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5f is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I7c70e82646c5f8c32795874c54cc7f19a929c0cf Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59a -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090199 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I841e2e533f6701ce40776ef29bf787984014b63e Signed-off-by:
-
Beverly Tai authored
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090199 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: Ie5c740cd3915822597a657b438cda181ec93f4c3 Signed-off-by:
-
Pinyao Ting authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Id673ef9644326d7c372ae5e89d61212fefa5bc25 Signed-off-by:
-
Treehugger Robot authored
-
Pinyao Ting authored
-
- Sep 30, 2023
-
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c95 -s ours am: b97477cd -s ours am: b4e7f02f -s ours am: a525c08d -s ours am: 372e2a48 -s ours am: 3cc29610 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe53e86 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607942 Change-Id: Iefd4ca37ca44078107dca347d909eaf3b6b70e65 Signed-off-by:
-
