| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from devil.android import device_blacklist | 5 from devil.android import device_blacklist |
| 6 from devil.android import device_errors | 6 from devil.android import device_errors |
| 7 from devil.android import device_utils | 7 from devil.android import device_utils |
| 8 from devil.android.sdk import adb_wrapper | |
| 9 from devil.utils import parallelizer | 8 from devil.utils import parallelizer |
| 10 from pylib.base import environment | 9 from pylib.base import environment |
| 11 | 10 |
| 12 | 11 |
| 13 class LocalDeviceEnvironment(environment.Environment): | 12 class LocalDeviceEnvironment(environment.Environment): |
| 14 | 13 |
| 15 def __init__(self, args, _error_func): | 14 def __init__(self, args, _error_func): |
| 16 super(LocalDeviceEnvironment, self).__init__() | 15 super(LocalDeviceEnvironment, self).__init__() |
| 17 self._blacklist = device_blacklist.Blacklist( | 16 self._blacklist = device_blacklist.Blacklist( |
| 18 args.blacklist_file or device_blacklist.BLACKLIST_JSON) | 17 args.blacklist_file or device_blacklist.BLACKLIST_JSON) |
| (...skipping 30 matching lines...) Expand all Loading... |
| 49 return self._max_tries | 48 return self._max_tries |
| 50 | 49 |
| 51 @property | 50 @property |
| 52 def tool(self): | 51 def tool(self): |
| 53 return self._tool_name | 52 return self._tool_name |
| 54 | 53 |
| 55 #override | 54 #override |
| 56 def TearDown(self): | 55 def TearDown(self): |
| 57 pass | 56 pass |
| 58 | 57 |
| OLD | NEW |