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

Commit dbb491f4 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Relaunch the activity with current configuration to avoid flakiness am: 223294a8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24722435



Change-Id: I1fb6f4c7afe17e72f53b3a4411b19a69a6d4f7bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2be51dbf 223294a8

core/tests/coretests/src/android/app/activity/ActivityThreadTest.java

+3 −1
Original line number Diff line number Diff line
@@ -784,8 +784,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*/);