am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev

* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
  Report keyguard as initially showing and secure until we know

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

@@ -200,7 +200,7 @@ public class KeyguardViewMediator {
 
     // cached value of whether we are showing (need to know this to quickly
     // answer whether the input should be restricted)
-    private boolean mShowing = false;
+    private boolean mShowing;
 
     // true if the keyguard is hidden by another window
     private boolean mHidden = false;
@@ -508,6 +508,9 @@ public class KeyguardViewMediator {
                 ? lockPatternUtils : new LockPatternUtils(mContext);
         mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER);
 
+        // Assume keyguard is showing (unless it's disabled) until we know for sure...
+        mShowing = !mLockPatternUtils.isLockScreenDisabled();
+
         WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
 
         mKeyguardViewManager = new KeyguardViewManager(context, wm, mViewMediatorCallback,

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

@@ -40,6 +40,14 @@ public class KeyguardServiceDelegate {
     private KeyguardState mKeyguardState = new KeyguardState();
 
     /* package */ 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.
+            // KeyguardService itself should default to this state until the real state is known.
+            showing = true;
+            showingAndNotHidden = true;
+            secure = true;
+        }
         boolean showing;
         boolean showingAndNotHidden;
         boolean inputRestricted;