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

* commit 'f8db59de22cb29f68ace8303e15e71dabf2b39e5': Run isKeyguardSecure under system privileges
2015-01-14 21:13:37 +00:00
parent dd6961d768 f8db59de22
commit dc1274c5d0
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
@@ -5401,7 +5401,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