[polymer] Merge of master into polymer10-migration

devil/devil/android/battery_utils.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides a variety of device interactions with power.
 """
 # pylint: disable=unused-argument
 
 import collections
 import contextlib
@@ skipping 77 matching lines @@
   {
     'name': 'Nexus 10',
     'witness_file': None,
     'enable_command': None,
     'disable_command': None,
     'charge_counter': None,
     'voltage': '/sys/class/power_supply/ds2784-fuelgauge/voltage_now',
     'current': '/sys/class/power_supply/ds2784-fuelgauge/current_now',
 
   },
+  {
+    'name': 'Nexus 5X',
+    'witness_file': None,
+    'enable_command': (
+        'echo 1 > /sys/class/power_supply/battery/charging_enabled && '
+        'dumpsys battery reset'),
+    'disable_command': (
+        'echo 0 > /sys/class/power_supply/battery/charging_enabled && '
+        'dumpsys battery set ac 0 && dumpsys battery set usb 0'),
+    'charge_counter': None,
+    'voltage': None,
+    'current': None,
+  },
 ]
 
 # The list of useful dumpsys columns.
 # Index of the column containing the format version.
 _DUMP_VERSION_INDEX = 0
 # Index of the column containing the type of the row.
 _ROW_TYPE_INDEX = 3
 # Index of the column containing the uid.
 _PACKAGE_UID_INDEX = 4
 # Index of the column containing the application package.
@@ skipping 538 matching lines @@
     self._cache['profile'] = {
         'name': None,
         'witness_file': None,
         'enable_command': None,
         'disable_command': None,
         'charge_counter': None,
         'voltage': None,
         'current': None,
     }
     return False