| commit | af42b546262ba641eceaec08b2df1984719850b0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 06 05:34:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 06 05:34:43 2021 +0000 |
| tree | 8261b1e360ff0ce4fd1c0071988e6d1d4a2fabeb | |
| parent | b30a2798f94ea63e2cbd7ace2b7ec6444497299a [diff] | |
| parent | 541a1a6da5e788e07eebe4ece95a71a6fac6849a [diff] |
Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev am: 5a25696bfd am: 541a1a6da5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472699 Change-Id: I62a970d75b5be3c9a48605e8b343305d2b0fe4ec
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 6249e6a..42c89fd 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1534,7 +1534,9 @@ boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted; mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget()); - TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + if (mRecentsAnimationTargets != null) { + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + } // Leave the pending invisible flag, as it may be used by wallpaper open animation. if (mActivity != null) {