Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-10-12 04:29:00 +00:00
committed by Android (Google) Code Review
parent 166434eca5 6a3cceb4d9
commit 2222a508e7
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
View File

@@ -431,7 +431,18 @@ public class KeyguardViewManager {
public synchronized void onScreenTurnedOn(final IKeyguardShowCallback callback) {
if (DEBUG) Log.d(TAG, "onScreenTurnedOn()");
mScreenOn = true;
final IBinder token = mKeyguardHost == null ? null : mKeyguardHost.getWindowToken();
final IBinder token;
// If keyguard is disabled, we need to inform PhoneWindowManager with a null
// token so it doesn't wait for us to draw...
final boolean disabled =
mLockPatternUtils.isLockScreenDisabled() && !mLockPatternUtils.isSecure();
if (mKeyguardHost == null || disabled) {
token = null;
} else {
token = mKeyguardHost.getWindowToken();
}
if (mKeyguardView != null) {
mKeyguardView.onScreenTurnedOn();