commit | 42a6516de996b547ecbfc53fd7e101f2b8b6c490 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Thu Jun 21 14:07:13 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 14:07:13 2012 -0700 |
tree | 36bb39f5ed3f627cd20dcdb9830666bf9320c220 | |
parent | 242f1323d2a2721bad4bd873785937d53ccdca8a [diff] | |
parent | 89c6bec3218d2f3f6d9fbe04fe2936021440ea80 [diff] |
am 89c6bec3: Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev * commit '89c6bec3218d2f3f6d9fbe04fe2936021440ea80': Make sure onScreenTurnedOn is called at power on.
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 85156998..e84e912 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -442,7 +442,9 @@ mScreenOn = true; mDelayedShowingSequence++; if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence); - notifyScreenOnLocked(showListener); + if (showListener != null) { + notifyScreenOnLocked(showListener); + } } }
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index beeea8e..756a3df 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3608,6 +3608,10 @@ }); } } else { + if (mKeyguardMediator != null) { + // Must set mScreenOn = true. + mKeyguardMediator.onScreenTurnedOn(null); + } synchronized (mLock) { mScreenOnFully = true; }