Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45a4aec authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "What a horrible fix"

parents 838337d0 f0a67e37
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -460,6 +460,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
                boolean staying = mStatusBar.hideKeyguard();
                boolean staying = mStatusBar.hideKeyguard();
                if (!staying) {
                if (!staying) {
                    mStatusBarWindowController.setKeyguardFadingAway(true);
                    mStatusBarWindowController.setKeyguardFadingAway(true);
                    // hide() will happen asynchronously and might arrive after the scrims
                    // were already hidden, this means that the transition callback won't
                    // be triggered anymore and StatusBarWindowController will be forever in
                    // the fadingAway state.
                    mStatusBar.updateScrimController();
                    wakeAndUnlockDejank();
                    wakeAndUnlockDejank();
                } else {
                } else {
                    mStatusBar.finishKeyguardFadingAway();
                    mStatusBar.finishKeyguardFadingAway();