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

Commit ba5339d5 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Revert "Fix flicker while booting" 

This reverts commit 77cbe79b.

KeyguardScrim is not hiding for some reason. Need more time to investigate.

Change-Id: I7624138dded386a7310386bc78b3b496af55b2b9
Fixes: 31174702
Bug: 29643498
parent e58471e7

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −5
Original line number Diff line number Diff line
@@ -6400,9 +6400,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }



            mWindowManagerDrawComplete = true;

            if (mKeyguardDelegate != null) {

                mKeyguardDelegate.onDrawCompleteLw();

            }

        }



        finishScreenTurningOn();
@@ -6872,8 +6869,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    /** {@inheritDoc} */

    @Override

    public void systemReady() {

        mKeyguardDelegate = new KeyguardServiceDelegate(mContext,

                mWindowManagerFuncs.getWindowManagerLock());

        mKeyguardDelegate = new KeyguardServiceDelegate(mContext);

        mKeyguardDelegate.onSystemReady();



        readCameraLensCoverState();

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+2 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.view.ViewGroup; 
import android.view.WindowManager;

import android.view.WindowManagerPolicy.OnKeyguardExitResult;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.policy.IKeyguardDrawnCallback;

import com.android.internal.policy.IKeyguardExitCallback;

import com.android.internal.policy.IKeyguardService;
@@ -44,7 +43,6 @@ public class KeyguardServiceDelegate { 
    private static final int INTERACTIVE_STATE_AWAKE = 1;

    private static final int INTERACTIVE_STATE_GOING_TO_SLEEP = 2;



    private final Object mWindowManagerLock;

    protected KeyguardServiceWrapper mKeyguardService;

    private final Context mContext;

    private final View mScrim; // shown if keyguard crashes
@@ -52,9 +50,6 @@ public class KeyguardServiceDelegate { 
    private final KeyguardState mKeyguardState = new KeyguardState();

    private DrawnListener mDrawnListenerWhenConnect;



    @GuardedBy("mWindowManagerLock")

    private boolean mHideScrimPending;



    private static final class KeyguardState {

        KeyguardState() {

            // Assume keyguard is showing and secure until we know for sure. This is here in
@@ -97,12 +92,10 @@ public class KeyguardServiceDelegate { 
        @Override

        public void onDrawn() throws RemoteException {

            if (DEBUG) Log.v(TAG, "**** SHOWN CALLED ****");

            synchronized (mWindowManagerLock) {

                mHideScrimPending = true;

            }

            if (mDrawnListener != null) {

                mDrawnListener.onDrawn();

            }

            hideScrim();

        }

    };
@@ -123,8 +116,7 @@ public class KeyguardServiceDelegate { 
        }

    };



    public KeyguardServiceDelegate(Context context, Object windowManagerLock) {

        mWindowManagerLock = windowManagerLock;

    public KeyguardServiceDelegate(Context context) {

        mContext = context;

        mScrimHandler = UiThread.getHandler();

        mScrim = createScrim(context, mScrimHandler);
@@ -363,16 +355,6 @@ public class KeyguardServiceDelegate { 
        }

    }



    /**

     * Called when all windows were fully drawn.

     */

    public void onDrawCompleteLw() {

        if (mHideScrimPending) {

            hideScrim();

            mHideScrimPending = false;

        }

    }



    private static View createScrim(Context context, Handler handler) {

        final View view = new View(context);