commit 1804e258fa8f8eb3d5d04e6e773c2f7cb026d9e0
author Mathew Inwood <mathewi@google.com> Tue Oct 22 17:39:37 2013 +0100
committer Mathew Inwood <mathewi@google.com> Tue Oct 22 17:39:37 2013 +0100
tree 61f5f56c7a0506ea32280102defaf13c8fe9959e
parent e9293c1a1f9ac72b1ff1c47d41465eee39d44c1b

Set mServiceCreated to false when onDestroy().

If tests call shutdownService() themselves, we should not call onDestroy()
again from tearDown(). Set mServiceCreated to false when we call onDestroy
to prevent this.

Change-Id: I618cb770cb43072273abdd2fdffd3390911203a1

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 d8ced38..ad90fc6 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
@@ -263,6 +263,7 @@
         }
         if (mServiceCreated) {
             mService.onDestroy();
+            mServiceCreated = false;
         }
     }