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

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

Merge "Fix activity relaunch test failure" into udc-qpr-dev am: af1b826b am: 86cc088f 

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



Change-Id: I7a6855d823c731ac76610b1e224952ccadf29b64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89c91039 86cc088f

core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public class ActivityThreadClientTest { 


            // Verify for ON_START state. Activity should be relaunched.

            getInstrumentation().runOnMainSync(() -> clientSession.startActivity(r));

            recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_START);

            recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_PAUSE);



            // Verify for ON_RESUME state. Activity should be relaunched.

            getInstrumentation().runOnMainSync(() -> clientSession.resumeActivity(r));