| commit | 114ed012172fc376f3997549bbcbc63af8051f52 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 05 18:02:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 05 18:02:57 2021 +0000 |
| tree | fc8a342511c0ae97f8c09a021e8d081268a07483 | |
| parent | 7852ec43e46a1377156e01753f39e924980bdb09 [diff] | |
| parent | cf6900d9eea0e4df78c980d0fd07638936b5d2fa [diff] |
Merge "Fixes NPE in AbsSwipeUpHandler." into sc-dev am: cf6900d9ee Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14436551 Change-Id: Ifb3b0faa8b2c896f948eca080a7312ad8bb5cd1a
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 54adde2..10384a8 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1701,7 +1701,7 @@ // No need to apply any transform if there is ongoing swipe-pip-to-home animator since // that animator handles the leash solely. if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) { - if (mRecentsViewScrollLinked) { + if (mRecentsViewScrollLinked && mRecentsView != null) { mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset()); } mTaskViewSimulator.apply(mTransformParams);