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

Commit f7f93694 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 277479d9 a6659239

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -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();

    }

    }

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -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;