commit 7825b944b7ff956578f89cb9d19128afa76809d7
author Lucas Dupin <dupin@google.com> Mon Jun 03 20:22:39 2019 -0700
committer Lucas Dupin <dupin@google.com> Wed Jun 05 02:15:01 2019 +0000
tree fa30a276258f461e92aa07fc92e54fc514a24ffb
parent 63b02d86ae62d230307c782ef221ba85959193d2

Longer bouncer delay and simpler delay logic

Delay it for a little longer and always delay bouncer even if auth
didn't start yet.

Test: atest KeyguardBouncerTest
Test: swipe up from bouncer twice (before and after face auth)
Test: reboot, swipe up, observe no delay
Fixes: 134064323
Change-Id: I723e3ae72a6ba34c05ce41fa989c186c399f3ada

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index 0fdab01..34cc70c 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -60,6 +60,7 @@
 import com.android.systemui.statusbar.phone.ShadeController;
 import com.android.systemui.statusbar.phone.StatusBar;
 import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
+import com.android.systemui.statusbar.phone.UnlockMethodCache;
 import com.android.systemui.statusbar.policy.DeviceProvisionedController;
 import com.android.systemui.util.InjectionInflationController;
 import com.android.systemui.util.leak.GarbageMonitor;
@@ -130,8 +131,8 @@
             KeyguardBouncer.BouncerExpansionCallback expansionCallback) {
         return new KeyguardBouncer(context, callback, lockPatternUtils, container,
                 dismissCallbackRegistry, FalsingManagerFactory.getInstance(context),
-                expansionCallback, KeyguardUpdateMonitor.getInstance(context),
-                new Handler(Looper.getMainLooper()));
+                expansionCallback, UnlockMethodCache.getInstance(context),
+                KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper()));
     }
 
     public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,