Merge "Deprecate unused config and make them no-op" into main (6cc7c9df) · Commits · e / os / android_frameworks_base

ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodConfig.java

+6 −24

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package android.platform.test.ravenwood;

		import static android.os.Process.FIRST_APPLICATION_UID;
		import static android.os.Process.SYSTEM_UID;
		import static android.os.UserHandle.SYSTEM;

		import android.annotation.NonNull;
		@@ -61,17 +60,14 @@ public final class RavenwoodConfig {
		* Unless the test author requests differently, run as "nobody", and give each collection of
		* tests its own unique PID.
		*/
		int mUid = NOBODY_UID;
		int mUid = FIRST_APPLICATION_UID;
		int mPid = sNextPid.getAndIncrement();

		String mTestPackageName;
		String mTargetPackageName;

		int mMinSdkLevel;
		int mTargetSdkLevel = Build.VERSION_CODES.CUR_DEVELOPMENT;

		boolean mProvideMainThread = false;

		final RavenwoodSystemProperties mSystemProperties = new RavenwoodSystemProperties();

		final List<Class<?>> mServicesRequired = new ArrayList<>();
		@@ -108,20 +104,18 @@ public final class RavenwoodConfig {
		}

		/**
		* Configure the identity of this process to be the system UID for the duration of the
		* test. Has no effect on non-Ravenwood environments.
		* @deprecated no longer used. We always use an app UID.
		*/
		@Deprecated
		public Builder setProcessSystem() {
		mConfig.mUid = SYSTEM_UID;
		return this;
		}

		/**
		* Configure the identity of this process to be an app UID for the duration of the
		* test. Has no effect on non-Ravenwood environments.
		* @deprecated no longer used. We always use an app UID.
		*/
		@Deprecated
		public Builder setProcessApp() {
		mConfig.mUid = FIRST_APPLICATION_UID;
		return this;
		}

		@@ -143,14 +137,6 @@ public final class RavenwoodConfig {
		return this;
		}

		/**
		* Configure the min SDK level of the test.
		*/
		public Builder setMinSdkLevel(int sdkLevel) {
		mConfig.mMinSdkLevel = sdkLevel;
		return this;
		}

		/**
		* Configure the target SDK level of the test.
		*/
		@@ -160,14 +146,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 no longer used. Main thread is always available.
		*/
		@Deprecated
		public Builder setProvideMainThread(boolean provideMainThread) {
		mConfig.mProvideMainThread = provideMainThread;
		return this;
		}

ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java

+5 −11

Original line number	Diff line number	Diff line
		@@ -112,20 +112,18 @@ public final class RavenwoodRule implements TestRule {
		}

		/**
		* Configure the identity of this process to be the system UID for the duration of the
		* test. Has no effect on non-Ravenwood environments.
		* @deprecated no longer used. We always use an app UID.
		*/
		@Deprecated
		public Builder setProcessSystem() {
		mBuilder.setProcessSystem();
		return this;
		}

		/**
		* Configure the identity of this process to be an app UID for the duration of the
		* test. Has no effect on non-Ravenwood environments.
		* @deprecated no longer used. We always use an app UID.
		*/
		@Deprecated
		public Builder setProcessApp() {
		mBuilder.setProcessApp();
		return this;
		}

		@@ -139,14 +137,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 no longer used. Main thread is always available.
		*/
		@Deprecated
		public Builder setProvideMainThread(boolean provideMainThread) {
		mBuilder.setProvideMainThread(provideMainThread);
		return this;
		}