Manual merge of change 53051 from master (DO NOT MERGE)
Change-Id: Ia4697a15cb874f25849655994e10aa88ae60b328
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();
}