Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4958c5c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: If18bdecf64c52a451704e81a6bcd64329a5eabd9
parents 3066fce0 d8304cd2

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+2 −0
Original line number Diff line number Diff line
@@ -1940,6 +1940,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
    void removeHistoryRecords(WindowProcessController app) {

        removeHistoryRecords(mStoppingActivities, app, "mStoppingActivities");

        removeHistoryRecords(mFinishingActivities, app, "mFinishingActivities");

        removeHistoryRecords(mNoHistoryActivities, app, "mNoHistoryActivities");

    }



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

            }

        }

        pw.println(prefix + "mNoHistoryActivities=" + mNoHistoryActivities);

        pw.println();

    }

services/core/java/com/android/server/wm/TaskFragment.java

+0 −3
Original line number Diff line number Diff line
@@ -578,9 +578,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            isPausingDied = true;

        }

        if (mLastPausedActivity != null && mLastPausedActivity.app == app) {

            if (mLastPausedActivity.isNoHistory()) {

                mTaskSupervisor.mNoHistoryActivities.remove(mLastPausedActivity);

            }

            mLastPausedActivity = null;

        }

        return isPausingDied;