Revert of [Telemetry] Roll web-page-replay to the lastest commit

telemetry/third_party/webpagereplay/adb_install_cert.py

 # Copyright 2014 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """Installs certificate on phone with KitKat."""
 
 import argparse
 import logging
 import os
 import subprocess
 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."""
 
   def __init__(self, device_id, cert_name, cert_path):
     if not os.path.exists(cert_path):
       raise ValueError('Not a valid certificate path')
     self.device_id = device_id
     self.cert_name = cert_name
     self.cert_path = cert_path
     self.file_name = os.path.basename(self.cert_path)
     self.reformatted_cert_fname = None
     self.reformatted_cert_path = None
     self.android_cacerts_path = None
 
   @staticmethod
   def _run_cmd(cmd, dirname=None):
     return subprocess.check_output(cmd, cwd=dirname)
 
   def _adb(self, *args):
     """Runs the adb command."""
     cmd = ['adb']
     if self.device_id:
       cmd.extend(['-s', self.device_id])
     cmd.extend(args)
     return self._run_cmd(cmd)
 
   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)
 
   def _get_property(self, prop):
     return self._adb('shell', 'getprop', prop).strip()
 
   def check_device(self):
     install_warning = False
     if self._get_property('ro.product.device') != 'hammerhead':
       logging.warning('Device is not hammerhead')
@@ skipping 148 matching lines @@
   cert_installer = AndroidCertInstaller(args.device_id, args.cert_name,
                                         args.cert_path)
   if args.remove:
     cert_installer.remove_cert()
   else:
     cert_installer.install_cert(args.overwrite)
 
 
 if __name__ == '__main__':
   sys.exit(main())