Merge "Remove check preventing keyguardGoingAwayRunnable from being called if it's already going away." into sc-v2-dev am: 3cefbe75b5 am: f5fd9f2ab2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16480615

Change-Id: Icded49c439fb75ea0eb81cc26dd3719839d76eec
This commit is contained in:
TreeHugger Robot
2021-12-16 00:54:11 +00:00
committed by Automerger Merge Worker

View File

@@ -2107,15 +2107,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {
@Override
public void run() {
// If the keyguard is already going away, or it's about to because we are going to
// trigger the going-away remote animation to show the surface behind, don't do it
// again. That will cause the current animation to be cancelled unnecessarily.
if (mKeyguardStateController.isKeyguardGoingAway()
|| mSurfaceBehindRemoteAnimationRequested
|| mSurfaceBehindRemoteAnimationRunning) {
return;
}
Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");
if (DEBUG) Log.d(TAG, "keyguardGoingAway");
mKeyguardViewControllerLazy.get().keyguardGoingAway();