| commit | 0e3a685ce4caddacdafd0fc73d5042850da1813d | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue Aug 31 22:13:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 31 22:13:01 2021 +0000 |
| tree | de8a0e39f70f1f39120aa83376b8df8a83c2ac18 | |
| parent | 7f8e1c7213c46dfa0f0daaea04ec0af0104dbf3e [diff] | |
| parent | ff2171d232deadf1302216c7358c67fb9fe2f708 [diff] |
Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev am: ff2171d232 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15728602 Change-Id: Ief83226aee6b9ee7cc0f1d58fb14d9bfce0934dd
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 6e90a3a..4c46683 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -805,7 +805,9 @@ mActivityInitListener.unregister(); mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED); - TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + if (mRecentsAnimationTargets != null) { + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + } // Defer clearing the controller and the targets until after we've updated the state mRecentsAnimationController = null;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 810ecce..6aa7e06 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1351,8 +1351,10 @@ } Log.d(TASK_VIEW_ID_CRASH, "taskViewCount: " + getTaskViewCount() + " " + sb.toString()); + mRunningTaskViewId = -1; + } else { + mRunningTaskViewId = newRunningTaskView.getTaskViewId(); } - mRunningTaskViewId = newRunningTaskView.getTaskViewId(); } if (mNextPage == INVALID_PAGE) {