Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42a6516d authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 89c6bec3: Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev 

* commit '89c6bec3':
  Make sure onScreenTurnedOn is called at power on.
parents 242f1323 89c6bec3

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

+3 −1
Original line number Diff line number Diff line
@@ -442,9 +442,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback, 
            mScreenOn = true;

            mDelayedShowingSequence++;

            if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence);

            if (showListener != null) {

                notifyScreenOnLocked(showListener);

            }

        }

    }



    /**

     * Same semantics as {@link WindowManagerPolicy#enableKeyguard}; provide

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

+4 −0
Original line number Diff line number Diff line
@@ -3608,6 +3608,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                });

            }

        } else {

            if (mKeyguardMediator != null) {

                // Must set mScreenOn = true.

                mKeyguardMediator.onScreenTurnedOn(null);

            }

            synchronized (mLock) {

                mScreenOnFully = true;

            }