diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-01-13 23:21:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 23:21:43 +0000 |
| commit | f8db59de22cb29f68ace8303e15e71dabf2b39e5 (patch) | |
| tree | e0824b6b5ef93e2991b8f1953c84254a4dffce87 | |
| parent | 1549346a98227c1f41fa4bd99921139f2cf97a14 (diff) | |
| parent | 562e87bdd5eb58a97cce2224c36443f8915fa7d8 (diff) | |
| download | frameworks_base-f8db59de22cb29f68ace8303e15e71dabf2b39e5.zip frameworks_base-f8db59de22cb29f68ace8303e15e71dabf2b39e5.tar.gz frameworks_base-f8db59de22cb29f68ace8303e15e71dabf2b39e5.tar.bz2 | |
am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
automerge: 562e87b
* commit '562e87bdd5eb58a97cce2224c36443f8915fa7d8':
Run isKeyguardSecure under system privileges
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 7 |
1 files changed, 6 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 567ad87..590a2ab 100644 --- 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 |