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

Commit b0a1ac3a authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Relaunch the activity with current configuration to avoid flakiness" into main

parents 804f3ca0 ef51f596
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import android.view.View;
import android.window.WindowContextInfo;
import android.window.WindowTokenClientController;

import androidx.test.filters.FlakyTest;
import androidx.test.filters.MediumTest;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
@@ -630,7 +629,6 @@ public class ActivityThreadTest {
        });
    }

    @FlakyTest(bugId = 295234586)
    @Test
    public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {
        final TestActivity activity = mActivityTestRule.launchActivity(new Intent());
@@ -836,8 +834,10 @@ public class ActivityThreadTest {
    }

    private static ClientTransaction newRelaunchResumeTransaction(Activity activity) {
        final Configuration currentConfig = activity.getResources().getConfiguration();
        final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(null,
                null, 0, new MergedConfiguration(), false /* preserveWindow */);
                null, 0, new MergedConfiguration(currentConfig, currentConfig),
                false /* preserveWindow */);
        final ResumeActivityItem resumeStateRequest =
                ResumeActivityItem.obtain(true /* isForward */,
                        false /* shouldSendCompatFakeFocus*/);