From 2263cb9543f25a90c3d6ffd2f91e1b65a5f799c8 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Wed, 14 Feb 2018 06:59:14 -0800
Subject: Enforce CONTROL_KEYGUARD permission on WM.dismissKeyguard API

Change-Id: Id8cb1883ea61979701d11bc9c46852eb64f83413
Fixes: 67109817
Test: builds
---
 services/core/java/com/android/server/wm/WindowManagerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
         }
-- 
cgit v1.2.3-59-g8ed1b