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

Commit 00eb14cd authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '7300-s-crash' into 'v1-s' 

Fix NPE crash when merge transition to remote transition.

See merge request e/os/BlissLauncher3!31
parents 30407746 0c05795f

quickstep/src/com/android/quickstep/TaskViewUtils.java

+4 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLAT 
import static com.android.launcher3.anim.Interpolators.clampToProgress;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.statehandlers.DepthController.DEPTH;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
@@ -172,7 +173,7 @@ public final class TaskViewUtils { 
                ENABLE_QUICKSTEP_LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;

        final RemoteAnimationTargets targets =

                new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets,

                        inLiveTileMode ? MODE_CLOSING : MODE_OPENING);

                        !ENABLE_SHELL_TRANSITIONS && inLiveTileMode ? MODE_CLOSING : MODE_OPENING);

        final RemoteAnimationTargetCompat navBarTarget = targets.getNavBarRemoteAnimationTarget();



        SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
@@ -286,7 +287,8 @@ public final class TaskViewUtils { 
            topMostSimulators = remoteTargetHandles;

        }



        if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulators.length > 0) {

        if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulators != null

                && topMostSimulators.length > 0) {

            out.addFloat(v, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f));



            RemoteTargetHandle[] simulatorCopies = topMostSimulators;