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

Commit f0409346 authored by Jeff Chang's avatar Jeff Chang
Browse files

Fix the leak while remove the taskFragment 

ConcurrentModificationException is thrown from the ForEach function
while dealing with the dead process.  Task vanished event is sent
when remove task fragments and it updates the organized taskFragments
list at the same time.

Bug: 194728551
Test: - Launch activity to split and adb shell am force-stop process
Change-Id: I3a888def3337417565178407f13019f751bca017
parent 8c67d4c7

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

+5 −2
Original line number Diff line number Diff line
@@ -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*/);

        }