Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up the no-history entries while the app died" into sc-v2-dev am: f7f93694ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878942

Change-Id: I63dcc5c20a6ba454335efceafb19397321b1aec5
This commit is contained in:
TreeHugger Robot
2021-09-24 01:55:43 +00:00
committed by Automerger Merge Worker
parent 8b52b14151 f7f93694ae
commit d8304cd2cd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -1940,6 +1940,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
void removeHistoryRecords(WindowProcessController app) { void removeHistoryRecords(WindowProcessController app) {
removeHistoryRecords(mStoppingActivities, app, "mStoppingActivities"); removeHistoryRecords(mStoppingActivities, app, "mStoppingActivities");
removeHistoryRecords(mFinishingActivities, app, "mFinishingActivities"); removeHistoryRecords(mFinishingActivities, app, "mFinishingActivities");
removeHistoryRecords(mNoHistoryActivities, app, "mNoHistoryActivities");
} }
private void removeHistoryRecords(ArrayList<ActivityRecord> list, WindowProcessController app, private void removeHistoryRecords(ArrayList<ActivityRecord> list, WindowProcessController app,
@@ -1977,6 +1978,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
mWaitingActivityLaunched.get(i).dump(pw, prefix + " "); mWaitingActivityLaunched.get(i).dump(pw, prefix + " ");
} }
} }
pw.println(prefix + "mNoHistoryActivities=" + mNoHistoryActivities);
pw.println(); pw.println();
} }

3
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -578,9 +578,6 @@ class TaskFragment extends WindowContainer<WindowContainer> {
isPausingDied = true; isPausingDied = true;
} }
if (mLastPausedActivity != null && mLastPausedActivity.app == app) { if (mLastPausedActivity != null && mLastPausedActivity.app == app) {
if (mLastPausedActivity.isNoHistory()) {
mTaskSupervisor.mNoHistoryActivities.remove(mLastPausedActivity);
}
mLastPausedActivity = null; mLastPausedActivity = null;
} }
return isPausingDied; return isPausingDied;