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

Commit aaa69238 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Wait more time to complete activity launch" into main

parents 8a441b39 ac4fe94c

tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class UpdatableSystemFontTest { 
            EMOJI_RENDERING_TEST_APP_ID + "/.EmojiRenderingTestActivity";

    // This should be the same as the one in EmojiRenderingTestActivity.

    private static final String TEST_NOTO_SERIF = "test-noto-serif";

    private static final long ACTIVITY_TIMEOUT_MILLIS = SECONDS.toMillis(10);

    private static final long ACTIVITY_TIMEOUT_MILLIS = SECONDS.toMillis(50);



    private static final String GET_AVAILABLE_FONTS_TEST_ACTIVITY =

            EMOJI_RENDERING_TEST_APP_ID + "/.GetAvailableFontsTestActivity";
@@ -452,7 +452,7 @@ public class UpdatableSystemFontTest { 


    private static void startActivity(String appId, String activityId) throws Exception {

        expectCommandToSucceed("am force-stop " + appId);

        expectCommandToSucceed("am start-activity -n " + activityId);

        expectCommandToSucceed("am start-activity -W -n " + activityId);

    }



    private static String expectCommandToSucceed(String cmd) throws IOException {