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

Commit 9d0a7749 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes I413ec5ed,Id667768c into udc-dev-plus-aosp am: 91885339 

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



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

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

+2 −8
Original line number 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),

            // 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(

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

                    () -> activityThread.executeTransaction(

                            newRelaunchResumeTransaction(activity)));



            assertScreenScale(scale, activity, originalActivityConfig, originalActivityMetrics);

        } finally {