commit a3db17a4906d6bce2a4e96f6b532a2b59b8c5b08
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Mar 07 04:32:30 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 04:32:30 2019 +0000
tree f212b1432b2ea91ec6e41de7fe66a1b9e9792e0e
parent 48bd63f18b1014ccd021e1094c6fdcb0b63cbd5d
parent f72125d46d6f1b428a49a5acad0d3776469ac206

Merge "Merge "Fix SocketUtils API" am: 3da7809ae4 am: f0ef74dc7a am: 4adf7d6a17"

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index f208118..32e447b 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1602,7 +1602,7 @@
                 (mBouncer && !mKeyguardGoingAway) || mGoingToSleep ||
                 shouldListenForFingerprintAssistant() || (mKeyguardOccluded && mIsDreaming))
                 && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
-                && !mKeyguardGoingAway && mIsPrimaryUser;
+                && (!mKeyguardGoingAway || !mDeviceInteractive) && mIsPrimaryUser;
         return shouldListen;
     }