Loading core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +3 −3 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -630,7 +629,6 @@ public class ActivityThreadTest { }); } @FlakyTest(bugId = 295234586) @Test public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() { final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); Loading Loading @@ -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*/); Loading Loading
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +3 −3 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -630,7 +629,6 @@ public class ActivityThreadTest { }); } @FlakyTest(bugId = 295234586) @Test public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() { final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); Loading Loading @@ -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*/); Loading