openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE when consuming snapshots for recent animation 

Fix: 207716265
Test: no exception throws after recent animation
Change-Id: Ic35aea2285fb120f7d0b5215137ad9450518702f
This commit is contained in:
Jerry Chang 2022-01-10 18:00:58 +08:00
parent d873788275
commit 7f8e57ed68
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
quickstep/src/com/android/quickstep/GestureState.java
View File

@ -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.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
import android.annotation.Nullable;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Intent; import android.content.Intent;
@ -397,11 +398,15 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
* while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for * while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for
* calling {@link RecentsAnimationController#cleanupScreenshot()}. * calling {@link RecentsAnimationController#cleanupScreenshot()}.
*/ */
@Nullable
HashMap<Integer, ThumbnailData> consumeRecentsAnimationCanceledSnapshot() { HashMap<Integer, ThumbnailData> consumeRecentsAnimationCanceledSnapshot() {
HashMap<Integer, ThumbnailData> data = if (mRecentsAnimationCanceledSnapshots != null) {
new HashMap<Integer, ThumbnailData>(mRecentsAnimationCanceledSnapshots); HashMap<Integer, ThumbnailData> data =
mRecentsAnimationCanceledSnapshots = null; new HashMap<Integer, ThumbnailData>(mRecentsAnimationCanceledSnapshots);
return data; mRecentsAnimationCanceledSnapshots = null;
return data;
}
return null;
} }
void setSwipeUpStartTimeMs(long uptimeMs) { void setSwipeUpStartTimeMs(long uptimeMs) {