| commit | b02d804b481352939b7382eb76acce0e29f2e0bf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 05 18:03:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 05 18:03:04 2021 +0000 |
| tree | a1f75dc1eaa953e9ac484a9de49daa444eba613d | |
| parent | 167033df6f5af92ba8307434f2fa9e97385112c6 [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: Idbf545544316d93757ac5779ebae696e27d6cc4e
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);