diff options
| author | 2023-09-15 19:54:47 +0000 | |
|---|---|---|
| committer | 2023-09-15 19:54:47 +0000 | |
| commit | 17405aa5918e63e78e26fe12313674dfdc5ac8a1 (patch) | |
| tree | 74e7ef040b9f4f8dcc356542909059e7fb504d3f | |
| parent | b8780fe610cb38b7546078fbd1ab4cb5ba6d7402 (diff) | |
| parent | c4e7a6081e41de22faa7934acd1b83d9428cfac8 (diff) | |
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230
Change-Id: I6c596a90c8be3be9acf77081eae652d74cbf23bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index f830f6fe0926..ae4b82bbcdbe 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static android.Manifest.permission.BIND_VOICE_INTERACTION; import static android.Manifest.permission.CHANGE_CONFIGURATION; +import static android.Manifest.permission.CONTROL_KEYGUARD; import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS; import static android.Manifest.permission.INTERACT_ACROSS_USERS; import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL; @@ -3427,6 +3428,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public void keyguardGoingAway(int flags) { + mAmInternal.enforceCallingPermission(CONTROL_KEYGUARD, "unlock keyguard"); enforceNotIsolatedCaller("keyguardGoingAway"); final long token = Binder.clearCallingIdentity(); try { |