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

Commit 4c6a8fc2 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Fix OOM when running testAddRemoveRace 

The test has been very likely to fail with OOM error or process crashes.
This is because we repeatedly creating ActivityRecord/ActivityStack/Task
in the test. Even though we release it after each run, the GC can still
throw OOM because of reference by mocking is not released while running
the test. After receiving several OOM's, the test process will crash.

To fix this issue, simply re-use the same ActivityRecord instead of
creating one per loop run. This works for this test as we only care
about the starting window handling inside ActivityRecord.

Test: atest AppWindowTokenTests#testAddRemoveRace
Bug: 130392471
Change-Id: I7df942d364ee07e179b05b6f837494c475197d7c
parent ec5ab8b1

services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java

+1 −5
Original line number Diff line number Diff line
@@ -316,20 +316,16 @@ public class AppWindowTokenTests extends WindowTestsBase { 
    }



    @Test

    @FlakyTest(bugId = 130392471)

    public void testAddRemoveRace() {

        // There was once a race condition between adding and removing starting windows

        final ActivityRecord appToken = mAppWindow.mActivityRecord;

        for (int i = 0; i < 1000; i++) {

            final ActivityRecord appToken = createIsolatedTestActivityRecord();



            appToken.addStartingWindow(mPackageName,

                    android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,

                    false, false);

            appToken.removeStartingWindow();

            waitUntilHandlersIdle();

            assertNoStartingWindow(appToken);



            appToken.getParent().getParent().removeImmediately();

        }

    }