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

Merge "Null check RecentsView before calling launchSideTaskInLiveTileMode" into sc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2021-05-07 03:49:52 +00:00
committed by Android (Google) Code Review
parent ea34ef9f5f adc109cabe
commit 8d8a655bbb
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() if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
&& activityInterface.getCreatedActivity() != null) { && activityInterface.getCreatedActivity() != null) {
RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel(); RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId); if (recentsView != null) {
ActivityManagerWrapper.getInstance().unregisterTaskStackListener( recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
mLiveTileRestartListener); ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
mLiveTileRestartListener);
}
} }
} }
}; };
@@ -135,10 +137,12 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
&& activityInterface.getCreatedActivity() != null) { && activityInterface.getCreatedActivity() != null) {
RecentsView recentsView = RecentsView recentsView =
activityInterface.getCreatedActivity().getOverviewPanel(); activityInterface.getCreatedActivity().getOverviewPanel();
RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1]; if (recentsView != null) {
apps[0] = appearedTaskTarget; RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps); apps[0] = appearedTaskTarget;
return; recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
return;
}
} }
if (mController != null) { if (mController != null) {
if (mLastAppearedTaskTarget == null if (mLastAppearedTaskTarget == null