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

Commit f0a67e37 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

What a horrible fix 

setKeyguardFadingAway will only be called again with false when
the scrim animation is over. This means that if AM takes to long
to start the animation, something else might have already tried
to fade out the scrim because the device woke up or changed state.

Change-Id: I46f87a4e72f8a8408365c2852df9d2c58d53fd9a
Fixes: 115332000
Test: unlock with PIP and breakpoints
parent d5180a5e

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+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();