Revert "Fix flicker while booting"

This reverts commit 77cbe79b74a65d34c1a0b85f9d46c690b9441b88.

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

Change-Id: I7624138dded386a7310386bc78b3b496af55b2b9
Fixes: 31174702
Bug: 29643498
(cherry picked from commit ba5339d5d6012d91738be65cd6c87cb3cc918286)
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index ec07812..1132ff9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6400,9 +6400,6 @@
             }
 
             mWindowManagerDrawComplete = true;
-            if (mKeyguardDelegate != null) {
-                mKeyguardDelegate.onDrawCompleteLw();
-            }
         }
 
         finishScreenTurningOn();
@@ -6872,8 +6869,7 @@
     /** {@inheritDoc} */
     @Override
     public void systemReady() {
-        mKeyguardDelegate = new KeyguardServiceDelegate(mContext,
-                mWindowManagerFuncs.getWindowManagerLock());
+        mKeyguardDelegate = new KeyguardServiceDelegate(mContext);
         mKeyguardDelegate.onSystemReady();
 
         readCameraLensCoverState();
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
index acf855f..2af4c9b 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@ -19,7 +19,6 @@
 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 @@
     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 @@
     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 @@
         @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 KeyguardServiceDelegate(Context context, Object windowManagerLock) {
-        mWindowManagerLock = windowManagerLock;
+    public KeyguardServiceDelegate(Context context) {
         mContext = context;
         mScrimHandler = UiThread.getHandler();
         mScrim = createScrim(context, mScrimHandler);
@@ -363,16 +355,6 @@
         }
     }
 
-    /**
-     * 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);