summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2018-02-14 06:59:14 -0800
committer Wale Ogunwale <ogunwale@google.com> 2018-02-14 06:59:14 -0800
commit2263cb9543f25a90c3d6ffd2f91e1b65a5f799c8 (patch)
tree9a5b7ae708e07c314da2de900bdb1dbfb52513b1
parent427ef56c0f6f36fbf2f1e5902037a28f4cae09e0 (diff)
Enforce CONTROL_KEYGUARD permission on WM.dismissKeyguard API
Change-Id: Id8cb1883ea61979701d11bc9c46852eb64f83413 Fixes: 67109817 Test: builds
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index e68fbdbac1a9..966f6226caed 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3005,7 +3005,9 @@ public class WindowManagerService extends IWindowManager.Stub
@Override
public void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message) {
- checkCallingPermission(permission.CONTROL_KEYGUARD, "dismissKeyguard");
+ if (!checkCallingPermission(permission.CONTROL_KEYGUARD, "dismissKeyguard")) {
+ throw new SecurityException("Requires CONTROL_KEYGUARD permission");
+ }
synchronized(mWindowMap) {
mPolicy.dismissKeyguardLw(callback, message);
}