From 25f3ab4ee7d14ac9453396e2100d27f3f52c7077 Mon Sep 17 00:00:00 2001 From: Evan Millar Date: Fri, 18 Jun 2010 16:19:26 -0700 Subject: [PATCH] Manual merge of change 53051 from master (DO NOT MERGE) Change-Id: Ia4697a15cb874f25849655994e10aa88ae60b328 --- test-runner/src/android/test/ServiceTestCase.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java index fcb9d55e8360f..d9262f6349066 100644 --- a/test-runner/src/android/test/ServiceTestCase.java +++ b/test-runner/src/android/test/ServiceTestCase.java @@ -147,9 +147,6 @@ public abstract class ServiceTestCase 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 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 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(); }