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

Commit b1c5cc8c 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 am: dbb491f4 

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



Change-Id: I3f8ec83f4fd598d8ed0369d714c04b53a50682a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dba7e128 dbb491f4

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

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