drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where keyguard reports a valid token but doesn't draw" into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-10-16 07:05:22 +00:00
committed by Android (Google) Code Review
parent db148b6556 ed80f3f01e
commit 67fc6b0b47
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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