Merge "Remove check preventing keyguardGoingAwayRunnable from being called if it's already going away." into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3cefbe75b5
@@ -2093,15 +2093,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
|||||||
private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {
|
private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
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");
|
Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");
|
||||||
if (DEBUG) Log.d(TAG, "keyguardGoingAway");
|
if (DEBUG) Log.d(TAG, "keyguardGoingAway");
|
||||||
mKeyguardViewControllerLazy.get().keyguardGoingAway();
|
mKeyguardViewControllerLazy.get().keyguardGoingAway();
|
||||||
|
|||||||
Reference in New Issue
Block a user