PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570

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

Change-Id: I88d51d664b00ec21145281782612045fc6297663
This commit is contained in:
Tony Wickham
2021-06-30 14:54:49 +00:00
committed by Automerger Merge Worker
parent f0b607b401 d61f224570
commit 597943985f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+12 -5
View File
@@ -140,7 +140,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private final ArrayList<Runnable> mRecentsAnimationStartCallbacks = new ArrayList<>();
private final OnScrollChangedListener mOnRecentsScrollListener = this::onRecentsViewScroll;
protected RecentsAnimationController mRecentsAnimationController;
// Null if the recents animation hasn't started yet or has been canceled or finished.
protected @Nullable RecentsAnimationController mRecentsAnimationController;
protected RecentsAnimationTargets mRecentsAnimationTargets;
protected T mActivity;
protected Q mRecentsView;
@@ -1354,8 +1355,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
@UiThread
private void resumeLastTask() {
mRecentsAnimationController.finish(false /* toRecents */, null);
ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
if (mRecentsAnimationController != null) {
mRecentsAnimationController.finish(false /* toRecents */, null);
ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
}
doLogGesture(LAST_TASK, null);
reset();
}
@@ -1663,13 +1666,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
}
} else {
mActivityInterface.onLaunchTaskFailed();
mRecentsAnimationController.finish(true /* toRecents */, null);
if (mRecentsAnimationController != null) {
mRecentsAnimationController.finish(true /* toRecents */, null);
}
}
}, true /* freezeTaskList */);
} else {
mActivityInterface.onLaunchTaskFailed();
Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
mRecentsAnimationController.finish(true /* toRecents */, null);
if (mRecentsAnimationController != null) {
mRecentsAnimationController.finish(true /* toRecents */, null);
}
}
}
mCanceled = false;