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

Commit 18f815a7 authored by Winson Chung's avatar Winson Chung Committed by Android Build Coastguard Worker
Browse files

Restore strong reference to animation runner 

- The remote animation factory needs to be strongly referenced since
  the only other reference is a weakly held one from
  LauncherAnimationRunner, and if a gc happens in between starting
  the animation and the onAnimationStart() callback, then the
  animation will not play.

Fixes: 284106887
Test: Force a gc after creating a remote app launch animation and ensure
      that the runner still exists when the animation starts
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cfe2e6cbe52f5fc9aa0eb94afaeb7679810cc13)
Merged-In: I5f584451b41c666916801b8ea0cb470c7ab9fc51
Change-Id: I5f584451b41c666916801b8ea0cb470c7ab9fc51
parent d5f28d79

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+5 −3
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
    private RemoteAnimationProvider mRemoteAnimationProvider;

    // Strong refs to runners which are cleared when the launcher activity is destroyed

    private RemoteAnimationFactory mWallpaperOpenRunner;

    private RemoteAnimationFactory mAppLaunchRunner;

    private RemoteAnimationFactory mKeyguardGoingAwayRunner;



    private RemoteAnimationFactory mWallpaperOpenTransitionRunner;
@@ -298,17 +299,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);

        RunnableList onEndCallback = new RunnableList();



        RemoteAnimationFactory delegateRunner = new AppLaunchAnimationRunner(v, onEndCallback);

        mAppLaunchRunner = new AppLaunchAnimationRunner(v, onEndCallback);

        ItemInfo tag = (ItemInfo) v.getTag();

        if (tag != null && tag.shouldUseBackgroundAnimation()) {

            ContainerAnimationRunner containerAnimationRunner =

                    ContainerAnimationRunner.from(v, mStartingWindowListener, onEndCallback);

            if (containerAnimationRunner != null) {

                delegateRunner = containerAnimationRunner;

                mAppLaunchRunner = containerAnimationRunner;

            }

        }

        RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(

                mHandler, delegateRunner, true /* startAtFrontOfQueue */);

                mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);



        // Note that this duration is a guess as we do not know if the animation will be a

        // recents launch or not for sure until we know the opening app targets.
@@ -1164,6 +1165,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            // Also clear strong references to the runners registered with the remote animation

            // definition so we don't have to wait for the system gc

            mWallpaperOpenRunner = null;

            mAppLaunchRunner = null;

            mKeyguardGoingAwayRunner = null;

        }

    }