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

Commit 4d459cb8 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Fix tests due to missing FLAG_START_NEW_TASK."

parents 86356ec7 c7a47cbf

core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -772,7 +772,8 @@ public class BstatsCpuTimesValidationTest { 
                latch.countDown();

                latch.countDown();

            }

            }

        });

        });

        launchIntent.putExtras(extras);

        launchIntent.putExtras(extras)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        sContext.startActivity(launchIntent);

        sContext.startActivity(launchIntent);

        if (latch.await(START_ACTIVITY_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {

        if (latch.await(START_ACTIVITY_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {

            if (binders[0] == null) {

            if (binders[0] == null) {

services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -388,7 +388,8 @@ public class ConnOnActivityStartTest { 
                latch.countDown();

                latch.countDown();

            }

            }

        });

        });

        launchIntent.putExtras(extras);

        launchIntent.putExtras(extras)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        mContext.startActivity(launchIntent);

        mContext.startActivity(launchIntent);

        if (latch.await(NETWORK_CHECK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {

        if (latch.await(NETWORK_CHECK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {

            if (errors[0] != null) {

            if (errors[0] != null) {