am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev

* commit '5536bb48b2829f04f9a8258bfe698e5e4a26f234':
  Fix stuck scrim on keyguard-less devices

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

diff --cc services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
index 00c8b0c,1406789..0f3a199
--- 1/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
--- 2/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@@ -35,9 -35,9 +35,9 @@@ public class KeyguardServiceDelegate 
      private final Context mContext;
      private final View mScrim; // shown if keyguard crashes
      private final KeyguardState mKeyguardState = new KeyguardState();
 -    private ShowListener mShowListenerWhenConnect;
 +    private DrawnListener mDrawnListenerWhenConnect;
  
-     /* package */ static final class KeyguardState {
+     private static final class KeyguardState {
          KeyguardState() {
              // Assume keyguard is showing and secure until we know for sure. This is here in
              // the event something checks before the service is actually started.