Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afeda05 authored by Evan Millar's avatar Evan Millar Committed by Android Git Automerger
Browse files

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

Merge commit 'e47e3f38' into gingerbread-plus-aosp

* commit 'e47e3f38':
  Manual merge of change 53051 from master (DO NOT MERGE)
parents 6c9a3004 e47e3f38

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();

        }