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

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

Merge "Fix OOM when running testAddRemoveRace" into rvc-dev am: 989150cb

Change-Id: I5eed5b8448f5565701c4749e21c09b97700e99c5
parents b16d643e 989150cb
Loading
Loading
Loading
Loading
+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();
        }
    }