Merge "Add null check for recents scaling during quick switch." into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-07-22 10:28:50 +00:00
committed by Android (Google) Code Review

View File

@@ -1821,7 +1821,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
// Scaling of RecentsView during quick switch based on amount of recents scroll
private float getScaleProgressDueToScroll() {
if (!mActivity.getDeviceProfile().isTablet || mRecentsView == null
if (mActivity == null || !mActivity.getDeviceProfile().isTablet || mRecentsView == null
|| !mRecentsViewScrollLinked) {
return 0;
}