diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-23 20:45:29 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-23 20:45:29 +0000 |
| commit | eeb92669f1e17d399cd16a4bef83f8709fb1d5ee (patch) | |
| tree | 7acd2e8ca29d91c6cc2e5132182f02c6489d341d | |
| parent | dd0219239a6ad2d3030f018719d4a06914ff5129 (diff) | |
| parent | 471caee3ac39887eb2f974a8be03f963c866e9e9 (diff) | |
| download | base-android-platform-11.0.0_r37.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24341230'] into rvc-platform-release.android-platform-11.0.0_r37
Change-Id: I7ec87dc70b946748cb6fc97d2c86fed22624ab80
| -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 f7f810e5b3d1..56d40d6fb769 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; @@ -3954,6 +3955,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 { |