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

Commit 69935f9a authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 

automerge: 0ca6b7f9

* commit '0ca6b7f9':
  Attempt to fix keyguard missing bug
parents ec9b598c 0ca6b7f9

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

+12 −5
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class KeyguardServiceDelegate { 
    private final Context mContext;

    private final View mScrim; // shown if keyguard crashes

    private final KeyguardState mKeyguardState = new KeyguardState();

    private ShowListener mShowListenerWhenConnect;



    /* package */ static final class KeyguardState {

        KeyguardState() {
@@ -130,7 +131,13 @@ public class KeyguardServiceDelegate { 
                // If the system is ready, it means keyguard crashed and restarted.

                mKeyguardService.onSystemReady();

                // This is used to hide the scrim once keyguard displays.

                mKeyguardService.onScreenTurnedOn(new KeyguardShowDelegate(null));

                mKeyguardService.onScreenTurnedOn(new KeyguardShowDelegate(

                        mShowListenerWhenConnect));

                if (mShowListenerWhenConnect != null) {

                    Log.v(TAG, "*** hiding scrim because keyguard wasn't ready");

                    mShowListenerWhenConnect = null;

                    hideScrim();

                }

            }

            if (mKeyguardState.bootCompleted) {

                mKeyguardService.onBootCompleted();
@@ -212,9 +219,10 @@ public class KeyguardServiceDelegate { 
        } else {

            // try again when we establish a connection

            Slog.w(TAG, "onScreenTurnedOn(): no keyguard service!");

            // This shouldn't happen, but if it does, invoke the listener immediately

            // to avoid a dark screen...

            showListener.onShown(null);

            // This shouldn't happen, but if it does, show the scrim immediately and

            // invoke the listener's callback after the service actually connects.

            mShowListenerWhenConnect = showListener;

            showScrim();

        }

        mKeyguardState.screenIsOn = true;

    }
@@ -280,7 +288,6 @@ public class KeyguardServiceDelegate { 
        lp.setTitle("KeyguardScrim");

        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);

        wm.addView(view, lp);

        view.setVisibility(View.GONE);

        // Disable pretty much everything in statusbar until keyguard comes back and we know

        // the state of the world.

        view.setSystemUiVisibility(View.STATUS_BAR_DISABLE_HOME