am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev

* commit '207d7bd3a4aca3478910ec740a0c810868fbeabb': Run isKeyguardSecure under system privileges
2015-01-13 23:14:58 +00:00
parent 82da2ee927 207d7bd3a4
commit 562e87bdd5
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -5381,7 +5381,12 @@ public class WindowManagerService extends IWindowManager.Stub

    @Override
    public boolean isKeyguardSecure() {
-        return mPolicy.isKeyguardSecure();
+        long origId = Binder.clearCallingIdentity();
+        try {
+            return mPolicy.isKeyguardSecure();
+        } finally {
+            Binder.restoreCallingIdentity(origId);
+        }
    }

    @Override