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

Merge "Null check RecentsView before calling launchSideTaskInLiveTileMode" into sc-dev am: 8d8a655bbb am: 68d7cad863

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

Change-Id: I8f825daf809100504eab78e52ccbed934b6b5e3f
This commit is contained in:
Tracy Zhou
2021-05-07 04:25:21 +00:00
committed by Automerger Merge Worker
parent d80f4a1f94 68d7cad863
commit 9784e21a61
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TaskAnimationManager.java
+11 -7
View File
@@ -61,9 +61,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
&& activityInterface.getCreatedActivity() != null) {
RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
mLiveTileRestartListener);
if (recentsView != null) {
recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
mLiveTileRestartListener);
}
}
}
};
@@ -135,10 +137,12 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
&& activityInterface.getCreatedActivity() != null) {
RecentsView recentsView =
activityInterface.getCreatedActivity().getOverviewPanel();
RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
apps[0] = appearedTaskTarget;
recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
return;
if (recentsView != null) {
RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
apps[0] = appearedTaskTarget;
recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
return;
}
}
if (mController != null) {
if (mLastAppearedTaskTarget == null