- Oct 05, 2023
-
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Atneya Nair authored
-
- Oct 04, 2023
-
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Id2b4f9656cad815cb7a94d6fdacd0dc6c50013f3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
- 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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: I7753a5e784502b873ef2a6e34b7a5db783d6b23e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Ia7a01cb75d9fea08186e37fc71db16531a2f00d2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Ib5bb11fae61b8a92bd3012984a2b67655e3caede Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24182288 Change-Id: Id673ef9644326d7c372ae5e89d61212fefa5bc25 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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 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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b61 -s ours am: b4c962e9 -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: Id4b27d5eee41f25de117bfcabdb5be5a940ce7ad Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 6fe53e86 -s ours am: 20e9d071 -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: Ic3cf3f2d694e10a085b607121650e2deeb16bf8f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c95 -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: Id2d1aa81e4d47ae8b25cf163b90b0763517dd3fb Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pawan Wagh authored
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: I26ff430b72ab45b5bccb01016ee1fc1da6494075 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yao Chen authored
-
Yao Chen authored
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b61 -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: I855c51fd9e02c95855dc4d7b0b06e869b4f9e87b Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pawan Wagh authored
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: Id86b5a97e99b8835f971a6a1acf45c3cab302fff Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yao Chen authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605805 Change-Id: I0cba03715c15b5ba995e46207623e21da2b65ca2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yao Chen authored
-
Yao Chen authored
-
- Sep 28, 2023
-
-
Kunal Malhotra authored
Test: manual testing on device Change-Id: I68903ebd6d3d85f4bc820b745e3233a448b62273 Bug: b/261709193 (cherry picked from commit b651d295) Merged-In: I68903ebd6d3d85f4bc820b745e3233a448b62273
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I5a59e5f4bc95ecb45dbe11f0ebabdefda32f755a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: Ie675bd43fc1c7022faa64fa0d66587e279ec0960 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I2211e60a745e9870688b94dba86fb31e7c6b21ce Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
-