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

Commit 44851253 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE from null thumbnail data when canceling recents animation" into... 

Merge "Fix NPE from null thumbnail data when canceling recents animation" into sc-v2-dev am: eb4b2d01 am: 401558e3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16333426

Change-Id: Ib2a7deeb645ab059c035e61ccceea30d0b22fbcc
parents 34a5ec9f 401558e3

quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java

+6 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.ArraySet; 
import android.view.RemoteAnimationTarget;



import androidx.annotation.BinderThread;

import androidx.annotation.NonNull;

import androidx.annotation.UiThread;



import com.android.launcher3.Utilities;
@@ -77,7 +78,7 @@ public class RecentsAnimationCallbacks implements 


    public void notifyAnimationCanceled() {

        mCancelled = true;

        onAnimationCanceled(null);

        onAnimationCanceled(new HashMap<>());

    }



    // Called only in Q platform
@@ -167,16 +168,17 @@ public class RecentsAnimationCallbacks implements 
         * Callback from the system when the recents animation is canceled. {@param thumbnailData}

         * is passed back for rendering screenshot to replace live tile.

         */

        default void onRecentsAnimationCanceled(HashMap<Integer, ThumbnailData> thumbnailDatas) {}

        default void onRecentsAnimationCanceled(

                @NonNull HashMap<Integer, ThumbnailData> thumbnailDatas) {}



        /**

         * Callback made whenever the recents animation is finished.

         */

        default void onRecentsAnimationFinished(RecentsAnimationController controller) {}

        default void onRecentsAnimationFinished(@NonNull RecentsAnimationController controller) {}



        /**

         * Callback made when a task started from the recents is ready for an app transition.

         */

        default void onTasksAppeared(RemoteAnimationTargetCompat[] appearedTaskTarget) {}

        default void onTasksAppeared(@NonNull RemoteAnimationTargetCompat[] appearedTaskTarget) {}

    }

}