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

Commit 6da1fdd1 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in... 

am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev

* commit 'fdfa4b7d':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
parents 13fb25b0 fdfa4b7d

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+1 −3
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
    private SecurityMode mCurrentSecuritySelection = SecurityMode.Invalid;

    private int mAppWidgetToShow;



    private boolean mBootCompleted = false;

    private boolean mCheckAppWidgetConsistencyOnBootCompleted = false;



    protected OnDismissAction mDismissAction;
@@ -149,7 +148,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
            new KeyguardUpdateMonitorCallback() {

        @Override

        public void onBootCompleted() {

            mBootCompleted = true;

            if (mCheckAppWidgetConsistencyOnBootCompleted) {

                checkAppWidgetConsistency();

                mSwitchPageRunnable.run();
@@ -1111,7 +1109,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
    public void checkAppWidgetConsistency() {

        // Since this method may bind a widget (which we can't do until boot completed) we

        // may have to defer it until after boot complete.

        if (!mBootCompleted) {

        if (!KeyguardUpdateMonitor.getInstance(mContext).hasBootCompleted()) {

            mCheckAppWidgetConsistencyOnBootCompleted = true;

            return;

        }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java

+10 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ public class KeyguardUpdateMonitor { 
    private int mRingMode;

    private int mPhoneState;

    private boolean mKeyguardIsVisible;

    private boolean mBootCompleted;



    // Device provisioning state

    private boolean mDeviceProvisioned;
@@ -431,6 +432,7 @@ public class KeyguardUpdateMonitor { 
     * Handle {@link #MSG_BOOT_COMPLETED}

     */

    protected void handleBootCompleted() {

        mBootCompleted = true;

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {
@@ -439,6 +441,14 @@ public class KeyguardUpdateMonitor { 
        }

    }



    /**

     * We need to store this state in the KeyguardUpdateMonitor since this class will not be 

     * destroyed.

     */

    public boolean hasBootCompleted() {

        return mBootCompleted;

    }



    /**

     * Handle {@link #MSG_USER_SWITCHED}

     */