Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread (e47e3f38) · Commits · e / os / android_frameworks_base

test-runner/src/android/test/ServiceTestCase.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -147,9 +147,6 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
		* @param intent The Intent as if supplied to {@link android.content.Context#startService}.
		*/
		protected void startService(Intent intent) {
		assertFalse(mServiceStarted);
		assertFalse(mServiceBound);

		if (!mServiceAttached) {
		setupService();
		}
		@@ -159,7 +156,7 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
		mService.onCreate();
		mServiceCreated = true;
		}
		mService.onStart(intent, mServiceId);
		mService.onStartCommand(intent, 0, mServiceId);

		mServiceStarted = true;
		}
		@@ -183,9 +180,6 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
		* @return Return an IBinder for making further calls into the Service.
		*/
		protected IBinder bindService(Intent intent) {
		assertFalse(mServiceStarted);
		assertFalse(mServiceBound);

		if (!mServiceAttached) {
		setupService();
		}