DeviceUtils: Fix crash when creating error message for a non-userdebugdevice

build/android/pylib/device/commands/install_commands.py

 # Copyright 2014 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.
 
 import os
 import posixpath
 
 from devil.android import device_errors
 from pylib import constants
 
@@ skipping 15 matching lines @@
 def Installed(device):
   paths = [posixpath.join(BIN_DIR, c) for c in _COMMANDS]
   paths.append(posixpath.join(_FRAMEWORK_DIR, 'chromium_commands.jar'))
   return device.PathExists(paths)
 
 
 def InstallCommands(device):
   if device.IsUserBuild():
     raise device_errors.CommandFailedError(
         'chromium_commands currently requires a userdebug build.',
-        device_serial=device.GetDeviceSerial())
+        device_serial=device.adb.GetDeviceSerial())

[jbudorick, 2015/09/11 15:34:34]

uh... er... how did this get here

 
   chromium_commands_jar_path = os.path.join(
       constants.GetOutDirectory(), constants.SDK_BUILD_JAVALIB_DIR,
       'chromium_commands.dex.jar')
   if not os.path.exists(chromium_commands_jar_path):
     raise device_errors.CommandFailedError(
         '%s not found. Please build chromium_commands.'
         % chromium_commands_jar_path)
 
   device.RunShellCommand(['mkdir', BIN_DIR, _FRAMEWORK_DIR])
   for command, main_class in _COMMANDS.iteritems():
     shell_command = _SHELL_COMMAND_FORMAT % (
         constants.TEST_EXECUTABLE_DIR, main_class)
     shell_file = '%s/%s' % (BIN_DIR, command)
     device.WriteFile(shell_file, shell_command)
     device.RunShellCommand(
         ['chmod', '755', shell_file], check_return=True)
 
   device.adb.Push(
       chromium_commands_jar_path,
       '%s/chromium_commands.jar' % _FRAMEWORK_DIR)