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 am: 6ffacb09a9

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

Change-Id: Ia6be7ba248c4a40a997c44f9eefe0a93f6c65a42
This commit is contained in:
Tracy Zhou
2021-07-02 18:45:38 +00:00
committed by Automerger Merge Worker
parent d942860979 6ffacb09a9
commit 0d31266d00
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) {
if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
getLiveTileParams().getTargetSet().findTask(taskId) != null) {
if (mRunningTaskId != -1 && mRunningTaskId == taskId) {
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);
}
}
}