DeviceUtils.ForceStop: no-op if the app isn't running

build/android/devil/android/device_utils_test.py

Index: build/android/devil/android/device_utils_test.py
diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py
index e474e10266c89bf71a891bbe48c17f88286ce5d5..db59e65797af14d096ee1fb0f28377596109ad78 100755
--- a/build/android/devil/android/device_utils_test.py
+++ b/build/android/devil/android/device_utils_test.py
@@ -627,8 +627,7 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
         (self.call.device._ComputeStaleApks('test.package',
             ['/fake/test/app.apk']),
          ([], None)),
-        (self.call.device.RunShellCommand(['am', 'force-stop', 'test.package'],
-                                          check_return=True))):
+        (self.call.device.ForceStop('test.package'))):
       self.device.Install(DeviceUtilsInstallTest.mock_apk,
           reinstall=True, retries=0, permissions=[])
 
@@ -1320,7 +1319,8 @@ class DeviceUtilsForceStopTest(DeviceUtilsTest):
 
   def testForceStop(self):
     with self.assertCall(
-        self.call.adb.Shell('am force-stop test.package'),
+        self.call.adb.Shell('p=test.package;if [[ "$(ps)" = *$p* ]]; then '
+                            'am force-stop $p; fi'),
         ''):
       self.device.ForceStop('test.package')