Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Millar
2010-06-21 12:09:40 -07:00
committed by Android (Google) Code Review
parent f25c560dcd 25f3ab4ee7
commit e47e3f3855
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test-runner/src/android/test/ServiceTestCase.java
View File

@@ -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}. * @param intent The Intent as if supplied to {@link android.content.Context#startService}.
*/ */
protected void startService(Intent intent) { protected void startService(Intent intent) {
assertFalse(mServiceStarted);
assertFalse(mServiceBound);
if (!mServiceAttached) { if (!mServiceAttached) {
setupService(); setupService();
} }
@@ -159,7 +156,7 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
mService.onCreate(); mService.onCreate();
mServiceCreated = true; mServiceCreated = true;
} }
mService.onStart(intent, mServiceId); mService.onStartCommand(intent, 0, mServiceId);
mServiceStarted = true; 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. * @return Return an IBinder for making further calls into the Service.
*/ */
protected IBinder bindService(Intent intent) { protected IBinder bindService(Intent intent) {
assertFalse(mServiceStarted);
assertFalse(mServiceBound);
if (!mServiceAttached) { if (!mServiceAttached) {
setupService(); setupService();
} }