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

Commit 268bc36f authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Workaround to fix remote animation hanging." into sc-dev am: ef483c66 

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

Change-Id: I86a007fa5ff12a1446b6ff69ef5477bf5e1fc0e9
parents 33752676 ef483c66

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+9 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            if (!mHiding

                    && !mSurfaceBehindRemoteAnimationRequested

                    && !mKeyguardStateController.isFlingingToDismissKeyguardDuringSwipeGesture()) {

                if (finishedCallback != null) {

                    // There will not execute animation, send a finish callback to ensure the remote

                    // animation won't hanging there.

                    try {

                        finishedCallback.onAnimationFinished();

                    } catch (RemoteException e) {

                        Slog.w(TAG, "Failed to call onAnimationFinished", e);

                    }

                }

                setShowingLocked(mShowing, true /* force */);

                return;

            }