commit e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8
author Evan Millar <emillar@google.com> Mon Jun 21 12:09:40 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 21 12:09:40 2010 -0700
tree 9f6d6b68cf1b2a27403a0d391b4029f36b40f122
parent f25c560dcdc0c04e11152fff11f521dae03522cd
parent 25f3ab4ee7d14ac9453396e2100d27f3f52c7077

Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread

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

diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java
index fcb9d55..d9262f6 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
@@ -147,9 +147,6 @@
      * @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 @@
             mService.onCreate();
             mServiceCreated = true;
         }
-        mService.onStart(intent, mServiceId);
+        mService.onStartCommand(intent, 0, mServiceId);
         
         mServiceStarted = true;
     }
@@ -183,9 +180,6 @@
      * @return Return an IBinder for making further calls into the Service.
      */
     protected IBinder bindService(Intent intent) {
-        assertFalse(mServiceStarted);
-        assertFalse(mServiceBound);
-        
         if (!mServiceAttached) {
             setupService();
         }