| commit | 5c3ce04d0af8e88a807956d4a1016343634f4b05 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 05 18:03:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 05 18:03:00 2021 +0000 |
| tree | 8b72a069fb075518728a7cd897d021c60ee62827 | |
| parent | d39c3b43474690e5f835cd2bfe79a760081d7010 [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: I0c3e9ab80f9a67721adf266b96aedf41f50950e4
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);