| commit | aaaddc7c318e360eba231716f4debc520d368273 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 05 18:31:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 05 18:31:16 2021 +0000 |
| tree | a1f75dc1eaa953e9ac484a9de49daa444eba613d | |
| parent | 6159fe9b7e74c0d3b2b90c7eec44ffa2f10692ba [diff] | |
| parent | ddaab15dbabcadba02baf0340b742ee4e7d898c7 [diff] |
Merge "Fixes NPE in AbsSwipeUpHandler." into sc-dev am: cf6900d9ee am: ddaab15dba Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14436551 Change-Id: I71daff767faee502cdcfe767c08ba44baca794b6
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);