Merge "[Ravenwood] Always provide main thread" into main (f814fea8) · Commits · e / os / android_frameworks_base

ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java

+5 −12

Original line number	Diff line number	Diff line
		@@ -225,14 +225,9 @@ public class RavenwoodRuntimeEnvironmentController {

		ActivityManager.init$ravenwood(config.mCurrentUser);

		final HandlerThread main;
		if (config.mProvideMainThread) {
		main = new HandlerThread(MAIN_THREAD_NAME);
		final var main = new HandlerThread(MAIN_THREAD_NAME);
		main.start();
		Looper.setMainLooperForTest(main.getLooper());
		} else {
		main = null;
		}

		final boolean isSelfInstrumenting =
		Objects.equals(config.mTestPackageName, config.mTargetPackageName);
		@@ -324,10 +319,8 @@ public class RavenwoodRuntimeEnvironmentController {
		}
		sMockUiAutomation.dropShellPermissionIdentity();

		if (config.mProvideMainThread) {
		Looper.getMainLooper().quit();
		Looper.clearMainLooperForTest();
		}

		ActivityManager.reset$ravenwood();

+3 −0

Original line number	Diff line number	Diff line
		@@ -152,7 +152,10 @@ public final class RavenwoodConfig {
		/**
		* Configure a "main" thread to be available for the duration of the test, as defined
		* by {@code Looper.getMainLooper()}. Has no effect on non-Ravenwood environments.
		*
		* @deprecated
		*/
		@Deprecated
		public Builder setProvideMainThread(boolean provideMainThread) {
		mConfig.mProvideMainThread = provideMainThread;
		return this;

+3 −0

Original line number	Diff line number	Diff line
		@@ -139,7 +139,10 @@ public final class RavenwoodRule implements TestRule {
		/**
		* Configure a "main" thread to be available for the duration of the test, as defined
		* by {@code Looper.getMainLooper()}. Has no effect on non-Ravenwood environments.
		*
		* @deprecated
		*/
		@Deprecated
		public Builder setProvideMainThread(boolean provideMainThread) {
		mBuilder.setProvideMainThread(provideMainThread);
		return this;