From ef344a3de33eb6979074b8636cc848c64fb5d039 Mon Sep 17 00:00:00 2001
From: Leif Hendrik Wilden <leifhendrik@google.com>
Date: Fri, 12 Jan 2018 14:40:30 -0800
Subject: [PATCH] Ensure keyguard is considered unlocked on devices that
 disable it.

Test: Manually tested that removable storage devices will now mount on ATV.
Bug: 71551000
Change-Id: I23eee328d54a9b61702a19b777fd1c8895d2d680
---
 .../com/android/systemui/keyguard/KeyguardViewMediator.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 653e5000f72c0..8501519d26aa0 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -707,6 +707,10 @@ public class KeyguardViewMediator extends SystemUI {
                     && !mLockPatternUtils.isLockScreenDisabled(
                             KeyguardUpdateMonitor.getCurrentUser()),
                     mSecondaryDisplayShowing, true /* forceCallbacks */);
+        } else {
+            // The system's keyguard is disabled or missing.
+            setShowingLocked(mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser()),
+                    mSecondaryDisplayShowing, true);
         }
 
         mStatusBarKeyguardViewManager =