summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-05-10 12:01:01 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-05-10 12:01:23 -0700
commit1d82dd4d128da64989538358655e4288daf15018 (patch)
treede8a29b7903d31f4d4b001574bb7621a7ecbff8b /quickstep
parent5d1873a812297ad207df1f068a987d2dd84a9888 (diff)
downloadandroid_packages_apps_Trebuchet-1d82dd4d128da64989538358655e4288daf15018.tar.gz
android_packages_apps_Trebuchet-1d82dd4d128da64989538358655e4288daf15018.tar.bz2
android_packages_apps_Trebuchet-1d82dd4d128da64989538358655e4288daf15018.zip
Fixing crash when cancelAnimaiton happens while we are aboutto enter long-swipe
Bug: 79419808 Change-Id: I17741ef7b35a8b82543e52c4958289933cf04a43
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 2eae2aebe..57993a44e 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -880,6 +880,13 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
return;
}
+ RemoteAnimationTargetSet targetSet = mRecentsAnimationWrapper.targetSet;
+ if (targetSet == null) {
+ // This can happen when cancelAnimation comes on the background thread, while we are
+ // processing the long swipe on the UI thread.
+ return;
+ }
+
mLongSwipeController = mActivityControlHelper.getLongSwipeController(
mActivity, mRecentsAnimationWrapper.targetSet);
onLongSwipeDisplacementUpdated();