Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

@@ -442,7 +442,9 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
             mScreenOn = true;
             mDelayedShowingSequence++;
             if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence);
-            notifyScreenOnLocked(showListener);
+            if (showListener != null) {
+                notifyScreenOnLocked(showListener);
+            }
         }
     }
 

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -3608,6 +3608,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 });
             }
         } else {
+            if (mKeyguardMediator != null) {
+                // Must set mScreenOn = true.
+                mKeyguardMediator.onScreenTurnedOn(null);
+            }
             synchronized (mLock) {
                 mScreenOnFully = true;
             }