| commit | 6e7d8303963852ec175b906655dfe42ed9b158aa | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jan 29 21:19:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 29 21:19:10 2021 +0000 |
| tree | 752bffecff996cdddc21123872c1400c88d806f8 | |
| parent | e5393d319252f296d8d18f7b9479861c92917080 [diff] | |
| parent | 79ead358cafb65bbc628d7dd5f3e9d2fa534273e [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 am: 79ead358ca Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13431431 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id9e4759a14a84ee363771ad93476033054b94d9d
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);