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

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

Change-Id: Ifc9b3dce39558aa7887bc7e720804ac40af739a3

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

@@ -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;
             }