| commit | 79ead358cafb65bbc628d7dd5f3e9d2fa534273e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jan 29 02:23:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 29 02:23:43 2021 +0000 |
| tree | e02af80f1f266c196d0e4999a7e1e182c3c79ecc | |
| parent | 59933c92b255a605f73bd6eae008ae24d1227a89 [diff] | |
| parent | 6bdd00fa25d8c98d26c2af42838c564c2be34421 [diff] |
Merge "Check whether the running task view is non null before setting it to be not clickable for live tile" into sc-dev am: 6bdd00fa25 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13431431 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia54c38bc953c24984cf6e8085782da0397cc3cde
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 5a2d6da..39a3a7c 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1451,7 +1451,10 @@ private void finishCurrentTransitionToRecents() { if (ENABLE_QUICKSTEP_LIVE_TILE.get()) { mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED); - mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true); + final TaskView runningTaskView = mRecentsView.getRunningTaskView(); + if (runningTaskView != null) { + runningTaskView.setIsClickableAsLiveTile(true); + } } else if (!hasTargets() || mRecentsAnimationController == null) { // If there are no targets or the animation not started, then there is nothing to finish mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);