diff options
| -rw-r--r-- | core/tests/coretests/src/android/app/activity/ActivityThreadTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java index a9234791247e..a9dd1cbbdbe3 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java @@ -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*/); |