| Index: telemetry/third_party/webpagereplay/adb_install_cert.py
|
| diff --git a/telemetry/third_party/webpagereplay/adb_install_cert.py b/telemetry/third_party/webpagereplay/adb_install_cert.py
|
| index 0c41452d4a030229f2d40303e1488f9e249654b8..4f311b043b7f0088650ec1bc79a5dbaf63c07b24 100644
|
| --- a/telemetry/third_party/webpagereplay/adb_install_cert.py
|
| +++ b/telemetry/third_party/webpagereplay/adb_install_cert.py
|
| @@ -23,19 +23,13 @@ import sys
|
| KEYCODE_ENTER = '66'
|
| KEYCODE_TAB = '61'
|
|
|
| -
|
| class CertInstallError(Exception):
|
| pass
|
|
|
| -
|
| class CertRemovalError(Exception):
|
| pass
|
|
|
|
|
| -
|
| -_ANDROID_M_BUILD_VERSION = 23
|
| -
|
| -
|
| class AndroidCertInstaller(object):
|
| """Certificate installer for phones with KitKat."""
|
|
|
| @@ -64,11 +58,7 @@ class AndroidCertInstaller(object):
|
|
|
| def _adb_su_shell(self, *args):
|
| """Runs command as root."""
|
| - build_version_sdk = int(self._get_property('ro.build.version.sdk'))
|
| - if build_version_sdk >= _ANDROID_M_BUILD_VERSION:
|
| - cmd = ['shell', 'su', '0']
|
| - else:
|
| - cmd = ['shell', 'su', '-c']
|
| + cmd = ['shell', 'su', '-c']
|
| cmd.extend(args)
|
| return self._adb(*cmd)
|
|
|
|
|