commit d32a472e5cd42a7aaf912d14c6bf4a04137c9ced
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 10:28:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 10:28:50 2021 +0000
tree 8c7f50d038d9757f4ff6f1e071453c6a01ab1746
parent 496ca0081ee79e2fdece2cdc1622b633e458c49c
parent b442aee4c4335106f4e813769f5d4220e8a8349c

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

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 357d407..076f28a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1821,7 +1821,7 @@
 
     // 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;
         }