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

Commit 105e2b2e authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Fix OOM when running testAddRemoveRace" into rvc-dev am: 989150cb am: f93eedda am: 706c4057" into rvc-qpr-dev-plus-aosp
parents 4b438d42 64c08072
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();
        }
    }