| commit | 125ea48ce570c00bc20630685f3f8ae6b1cd0cc2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 22 10:43:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 10:43:33 2021 +0000 |
| tree | 0956b1d2388064554834aaae42b366f33051b3ca | |
| parent | 016ba91625cf4d4b4a828335e60581b6c73c6ba8 [diff] | |
| parent | d32a472e5cd42a7aaf912d14c6bf4a04137c9ced [diff] |
Merge "Add null check for recents scaling during quick switch." into sc-v2-dev am: d32a472e5c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15358270 Change-Id: I7651d1192328c675bc4b31b97ded7869f7442ad1
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; }