PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev am: fa72529b05

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184810

Change-Id: I9cb5e7e4ca2269c56ef835eee93bdc5b605583ac
This commit is contained in:
Tracy Zhou
2021-07-02 18:37:22 +00:00
committed by Automerger Merge Worker
parent 34c449d72e fa72529b05
commit cd5ebbdaf4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+5 -3
View File
@@ -870,10 +870,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} }
public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) { public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
if (mRunningTaskId != -1 && mRunningTaskId == taskId && if (mRunningTaskId != -1 && mRunningTaskId == taskId) {
getLiveTileParams().getTargetSet().findTask(taskId) != null) {
RemoteAnimationTargets targets = getLiveTileParams().getTargetSet(); RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();
launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps); if (targets != null && targets.findTask(taskId) != null) {
launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,
targets.nonApps);
}
} }
} }