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

automerge: 562e87b

* commit '562e87bdd5eb58a97cce2224c36443f8915fa7d8':
  Run isKeyguardSecure under system privileges
This commit is contained in:
Fyodor Kupolov
2015-01-13 23:21:43 +00:00
committed by android-build-merger

View File

@@ -5401,7 +5401,12 @@ public class WindowManagerService extends IWindowManager.Stub
@Override @Override
public boolean isKeyguardSecure() { public boolean isKeyguardSecure() {
return mPolicy.isKeyguardSecure(); long origId = Binder.clearCallingIdentity();
try {
return mPolicy.isKeyguardSecure();
} finally {
Binder.restoreCallingIdentity(origId);
}
} }
@Override @Override