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

Commit 5360c00c authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when consuming snapshots for recent animation" into sc-v2-dev... 

Merge "Fix NPE when consuming snapshots for recent animation" into sc-v2-dev am: f6086e74 am: 0e22f994

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

Change-Id: I7cd1665d8bc22aecfa9feb39261087656be7facf
parents 73d6b4c9 0e22f994

quickstep/src/com/android/quickstep/GestureState.java

+9 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; 
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;

import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;



import android.annotation.Nullable;

import android.annotation.TargetApi;

import android.app.ActivityManager;

import android.content.Intent;
@@ -397,12 +398,16 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL 
     * while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for

     * calling {@link RecentsAnimationController#cleanupScreenshot()}.

     */

    @Nullable

    HashMap<Integer, ThumbnailData> consumeRecentsAnimationCanceledSnapshot() {

        if (mRecentsAnimationCanceledSnapshots != null) {

            HashMap<Integer, ThumbnailData> data =

                    new HashMap<Integer, ThumbnailData>(mRecentsAnimationCanceledSnapshots);

            mRecentsAnimationCanceledSnapshots = null;

            return data;

        }

        return null;

    }



    void setSwipeUpStartTimeMs(long uptimeMs) {

        mSwipeUpStartTimeMs = uptimeMs;