Merge "Fix the leak while remove the taskFragment" into sc-v2-dev

2021-07-29 01:28:25 +00:00
parent 2f74dacda9 f040934611
commit e1fdf43e2a
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
@@ -116,8 +116,11 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr
        }

        void dispose() {
-            mOrganizedTaskFragments.forEach(TaskFragment::removeImmediately);
-            mOrganizedTaskFragments.clear();
+            while (!mOrganizedTaskFragments.isEmpty()) {
+                final TaskFragment taskFragment = mOrganizedTaskFragments.get(0);
+                taskFragment.removeImmediately();
+                mOrganizedTaskFragments.remove(taskFragment);
+            }
            mOrganizer.asBinder().unlinkToDeath(this, 0 /*flags*/);
        }