Merge branch 'readonly-p4-master' (e9948b27) · Commits · e / os / android_frameworks_base

core/java/android/test/InstrumentationTestCase.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,10 @@ public class InstrumentationTestCase extends TestCase {
		* extras = null, unless a custom bundle is provided here
		* All other fields are null or empty.
		*
		* <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityCls The activity class to launch.
		* @param extras Optional extra stuff to pass to the activity.
		@@ -82,6 +86,11 @@ public class InstrumentationTestCase extends TestCase {

		/**
		* Utility method for launching an activity with a specific Intent.
		*
		* <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityCls The activity class to launch.
		* @param intent The intent to launch with

+10 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity>
		boolean mInitialTouchMode = false;

		/**
		* @param pkg The package of the instrumentation.
		* <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityClass The activity to test.
		*/
		public ActivityInstrumentationTestCase(String pkg, Class<T> activityClass) {
		@@ -48,7 +52,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity>
		}

		/**
		* @param pkg The package of the instrumentation.
		* <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityClass The activity to test.
		* @param initialTouchMode true = in touch mode
		*/

+5 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,11 @@ public abstract class ActivityInstrumentationTestCase2<T extends Activity>
		Intent mActivityIntent = null;

		/**
		* @param pkg The package of the instrumentation.
		* <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityClass The activity to test.
		*/
		public ActivityInstrumentationTestCase2(String pkg, Class<T> activityClass) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,11 @@ public abstract class SingleLaunchActivityTestCase<T extends Activity>
		private static boolean sActivityLaunchedFlag = false;

		/**
		* @param pkg The package of the instrumentation.
		* <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
		* package hosting the activity to be launched, which is specified in the AndroidManifest.xml
		* file. This is not necessarily the same as the java package name.
		*
		* @param pkg The package hosting the activity to be launched.
		* @param activityClass The activity to test.
		*/
		public SingleLaunchActivityTestCase(String pkg, Class<T> activityClass) {