[Android] Use correct command to set battery level in battery_utils.

BUG=567786

Review URL: https://codereview.chromium.org/1654793003

Cr-Commit-Position: refs/heads/master@{#372849}

9 files changed, 14 insertions, 12 deletions

diff --git a/build/android/devil/android/battery_utils.py b/build/android/devil/android/battery_utils.py
index b1eb9e1..3695c93 100644
--- a/build/android/devil/android/battery_utils.py
+++ b/build/android/devil/android/battery_utils.py
@@ -283,7 +283,7 @@ class BatteryUtils(object):
   @decorators.WithTimeoutAndRetriesFromInstance()
   def _ForceResetBatteryInfo(self, timeout=None, retries=None):
     # Sometimes battery information stops updating. This kick starts it.
-    self._device.RunShellCommand(['dumpsys', 'battery', 'level', '50'],
+    self._device.RunShellCommand(['dumpsys', 'battery', 'set', 'level', '50'],
                                  check_return=True)
     self._device.RunShellCommand(['dumpsys', 'battery', 'reset'],
                                  check_return=True)
diff --git a/build/android/devil/android/battery_utils_test.py b/build/android/devil/android/battery_utils_test.py
index fe9df09..0a8cbdd 100755
--- a/build/android/devil/android/battery_utils_test.py
+++ b/build/android/devil/android/battery_utils_test.py
@@ -19,7 +19,7 @@ from devil.android import device_utils
 from devil.android import device_utils_test
 from devil.utils import mock_calls
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 _DUMPSYS_OUTPUT = [
@@ -248,12 +248,14 @@ class BatteryUtilsChargeDevice(BatteryUtilsTest):
     with self.assertCalls(
         (self.call.battery.SetCharging(True)),
         (self.call.device.RunShellCommand(
-            ['dumpsys', 'battery', 'level', '50'], check_return=True), []),
+            ['dumpsys', 'battery', 'set', 'level', '50'],
+            check_return=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'reset'], check_return=True), []),
         (self.call.battery.GetBatteryInfo(), {'level': '50'}),
         (self.call.device.RunShellCommand(
-            ['dumpsys', 'battery', 'level', '50'], check_return=True), []),
+            ['dumpsys', 'battery', 'set', 'level', '50'],
+            check_return=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'reset'], check_return=True), []),
         (self.call.battery.GetBatteryInfo(), {'level': '100'})):
diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py
index 5c98262..659cea7 100755
--- a/build/android/devil/android/device_utils_test.py
+++ b/build/android/devil/android/device_utils_test.py
@@ -23,7 +23,7 @@ from devil.android.sdk import version_codes
 from devil.utils import cmd_helper
 from devil.utils import mock_calls
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 
diff --git a/build/android/devil/android/fastboot_utils_test.py b/build/android/devil/android/fastboot_utils_test.py
index b231d02..d82e155 100755
--- a/build/android/devil/android/fastboot_utils_test.py
+++ b/build/android/devil/android/fastboot_utils_test.py
@@ -20,7 +20,7 @@ from devil.android import fastboot_utils
 from devil.android.sdk import fastboot
 from devil.utils import mock_calls
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 _BOARD = 'board_type'
diff --git a/build/android/devil/android/logcat_monitor_test.py b/build/android/devil/android/logcat_monitor_test.py
index ffd798b..b096ef8 100755
--- a/build/android/devil/android/logcat_monitor_test.py
+++ b/build/android/devil/android/logcat_monitor_test.py
@@ -13,7 +13,7 @@ from devil import devil_env
 from devil.android import logcat_monitor
 from devil.android.sdk import adb_wrapper
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 
diff --git a/build/android/devil/android/md5sum_test.py b/build/android/devil/android/md5sum_test.py
index 5001557..c1e8bbb 100755
--- a/build/android/devil/android/md5sum_test.py
+++ b/build/android/devil/android/md5sum_test.py
@@ -10,7 +10,7 @@ from devil import devil_env
 from devil.android import device_errors
 from devil.android import md5sum
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 TEST_OUT_DIR = os.path.join('test', 'out', 'directory')
diff --git a/build/android/devil/android/tools/script_common_test.py b/build/android/devil/android/tools/script_common_test.py
index 5f4ef5f..bb5e29e 100755
--- a/build/android/devil/android/tools/script_common_test.py
+++ b/build/android/devil/android/tools/script_common_test.py
@@ -12,7 +12,7 @@ from devil.android import device_errors
 from devil.android import device_utils
 from devil.android.tools import script_common
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error
 
 
diff --git a/build/android/devil/devil_env_test.py b/build/android/devil/devil_env_test.py
index c680f2d..fcb5b3d 100755
--- a/build/android/devil/devil_env_test.py
+++ b/build/android/devil/devil_env_test.py
@@ -12,7 +12,7 @@ import unittest
 from devil import devil_env
 
 _sys_path_before = list(sys.path)
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   _sys_path_with_pymock = list(sys.path)
   import mock # pylint: disable=import-error
 _sys_path_after = list(sys.path)
@@ -22,7 +22,7 @@ class DevilEnvTest(unittest.TestCase):
   def testSysPath(self):
     self.assertEquals(_sys_path_before, _sys_path_after)
     self.assertEquals(
-        _sys_path_before + [devil_env.config.LocalPath('pymock')],
+        _sys_path_before + [devil_env.PYMOCK_PATH],
         _sys_path_with_pymock)
 
   def testGetEnvironmentVariableConfig_configType(self):
diff --git a/build/android/devil/utils/mock_calls.py b/build/android/devil/utils/mock_calls.py
index 9be1705..61ebb18 100644
--- a/build/android/devil/utils/mock_calls.py
+++ b/build/android/devil/utils/mock_calls.py
@@ -10,7 +10,7 @@ import unittest
 
 from devil import devil_env
 
-with devil_env.SysPath(devil_env.config.LocalPath('pymock')):
+with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock # pylint: disable=import-error