Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent double keyguardGoingAway, and finish cancelled animations." into sc-v2-dev am: 13453180ce am: aebaaa2910

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

Change-Id: Ia59b4b68eb8f1b93ae5a1fc1240c04e221a22774
This commit is contained in:
Josh Tsuji
2021-12-10 22:19:59 +00:00
committed by Automerger Merge Worker
parent 8199ec0d7e aebaaa2910
commit 7a1550ad5a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2099,6 +2099,15 @@ 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();
@@ -2457,9 +2466,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
if (mSurfaceBehindRemoteAnimationFinishedCallback != null) {
try {
if (!cancelled) {
mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished();
}
mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished();
mSurfaceBehindRemoteAnimationFinishedCallback = null;
} catch (RemoteException e) {
e.printStackTrace();