Merge "Wait for package_added broadcasts to be handled." into udc-dev (a9690cc8) · Commits · e / os / android_frameworks_base

core/tests/overlaytests/device/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ android_test {
		static_libs: [
		"androidx.test.rules",
		"testng",
		"compatibility-device-util-axt",
		],
		test_suites: ["device-tests"],
		data: [

+9 −0

Original line number	Diff line number	Diff line
		@@ -37,10 +37,12 @@ import android.view.View;

		import androidx.test.InstrumentationRegistry;

		import com.android.compatibility.common.util.AmUtils;
		import com.android.internal.util.ArrayUtils;
		import com.android.overlaytest.view.TestTextView;

		import org.junit.Before;
		import org.junit.BeforeClass;
		import org.junit.Ignore;
		import org.junit.Test;

		@@ -70,6 +72,13 @@ public abstract class OverlayBaseTest {
		mMode = mode;
		}

		@BeforeClass
		public static void setUpClass() {
		// Wait for package_added broadcasts to be handled so that OverlayManagerService
		// can update it's internal state with the new packages.
		AmUtils.waitForBroadcastBarrier();
		}

		@Before
		public void setUp() {
		mContext = InstrumentationRegistry.getContext();