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

Commit 91885339 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge changes I413ec5ed,Id667768c into udc-dev-plus-aosp 

* changes:
  Attempt fixing test flakiness
  Relaunch the activity with current configuration to avoid flakiness
parents ccf5f166 89c4516f

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

+5 −9
Original line number Original line Diff line number Diff line
@@ -232,15 +232,9 @@ public class ActivityThreadTest { 




            // Execute a local relaunch item with current scaled config (e.g. simulate recreate),

            // Execute a local relaunch item with current scaled config (e.g. simulate recreate),

            // the config should not be scaled again.

            // the config should not be scaled again.

            final Configuration currentConfig = activity.getResources().getConfiguration();

            final ClientTransaction localTransaction =

                    newTransaction(activityThread, activity.getActivityToken());

            localTransaction.addCallback(ActivityRelaunchItem.obtain(

                    null /* pendingResults */, null /* pendingIntents */, 0 /* configChanges */,

                    new MergedConfiguration(currentConfig, currentConfig),

                    true /* preserveWindow */));

            InstrumentationRegistry.getInstrumentation().runOnMainSync(

            InstrumentationRegistry.getInstrumentation().runOnMainSync(

                    () -> activityThread.executeTransaction(localTransaction));

                    () -> activityThread.executeTransaction(

                            newRelaunchResumeTransaction(activity)));





            assertScreenScale(scale, activity, originalActivityConfig, originalActivityMetrics);

            assertScreenScale(scale, activity, originalActivityConfig, originalActivityMetrics);

        } finally {

        } finally {
@@ -784,8 +778,10 @@ public class ActivityThreadTest { 
    }

    }





    private static ClientTransaction newRelaunchResumeTransaction(Activity activity) {

    private static ClientTransaction newRelaunchResumeTransaction(Activity activity) {

        final Configuration currentConfig = activity.getResources().getConfiguration();

        final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(null,

        final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(null,

                null, 0, new MergedConfiguration(), false /* preserveWindow */);

                null, 0, new MergedConfiguration(currentConfig, currentConfig),

                false /* preserveWindow */);

        final ResumeActivityItem resumeStateRequest =

        final ResumeActivityItem resumeStateRequest =

                ResumeActivityItem.obtain(true /* isForward */,

                ResumeActivityItem.obtain(true /* isForward */,

                        false /* shouldSendCompatFakeFocus*/);

                        false /* shouldSendCompatFakeFocus*/);