- Oct 06, 2023
-
-
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
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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
-
- 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 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 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 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 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:
-
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 29, 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 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: I4c891194296a63b5497d0a941b3aae545209f5c2 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: b4aaf180 -s ours am: 5a05c132 -s ours am: 275bc794 -s ours am: ff655ac2 -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: Idae0635fcb628c387b3327b61a44b9e7fd071f2c Signed-off-by:
-
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 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: Id535c32cb75f9e08faf551a5228a5221ee017dc0 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: b4aaf180 -s ours am: 5a05c132 -s ours am: 275bc794 -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: I09c1e0eae304c696c5270c677f55717b427fadaa Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c95 -s ours am: b97477cd -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: I844458cf69909b722149969f7bad1bd9893a9c10 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: b4aaf180 -s ours am: 5a05c132 -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: If77abecd1b6594e5c866a7711f2c19a1ed21cd01 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b61 -s ours am: b4c962e9 -s ours am: ff77cd49 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 598dc664 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608564 Change-Id: Ibcdea539d11281e8e79c403fec391348747e5b65 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 6fe53e86 -s ours am: 20e9d071 -s ours am: 3606e96b -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 598dc664 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608564 Change-Id: I240ab7ab87af558a169d5cb99633f74fb00716dd Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef36 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607943 Change-Id: Ic5cf619be79441a37b705744f3d53551c5526776 Signed-off-by:
-
Pawan Wagh authored
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607943 Change-Id: I6ded2630efa8a8ce5b312ae7196127acc510f357 Signed-off-by:
-
