Revert of [devil] Always set permissions on install

devil/devil/android/device_utils.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.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 820 matching lines @@
       self._cache['package_apk_paths'].pop(package_name, 0)
       self._cache['package_apk_checksums'].pop(package_name, 0)
       if split_apks:
         partial = package_name if len(apks_to_install) < len(all_apks) else None
         self.adb.InstallMultiple(
             apks_to_install, partial=partial, reinstall=reinstall,
             allow_downgrade=allow_downgrade)
       else:
         self.adb.Install(
             base_apk.path, reinstall=reinstall, allow_downgrade=allow_downgrade)
+      if (permissions is None
+          and self.build_version_sdk >= version_codes.MARSHMALLOW):
+        permissions = base_apk.GetPermissions()
+      self.GrantPermissions(package_name, permissions)
+      # Upon success, we know the device checksums, but not their paths.
+      if host_checksums is not None:
+        self._cache['package_apk_checksums'][package_name] = host_checksums
     else:
       # Running adb install terminates running instances of the app, so to be
       # consistent, we explicitly terminate it when skipping the install.
       self.ForceStop(package_name)
 
-    if (permissions is None
-        and self.build_version_sdk >= version_codes.MARSHMALLOW):
-      permissions = base_apk.GetPermissions()
-    self.GrantPermissions(package_name, permissions)
-    # Upon success, we know the device checksums, but not their paths.
-    if host_checksums is not None:
-      self._cache['package_apk_checksums'][package_name] = host_checksums
-
   @decorators.WithTimeoutAndRetriesFromInstance()
   def Uninstall(self, package_name, keep_data=False, timeout=None,
                 retries=None):
     """Remove the app |package_name| from the device.
 
     This is a no-op if the app is not already installed.
 
     Args:
       package_name: The package to uninstall.
       keep_data: (optional) Whether to keep the data and cache directories.
@@ skipping 1833 matching lines @@
       on: bool to decide state to switch to. True = on False = off.
     """
     def screen_test():
       return self.IsScreenOn() == on
 
     if screen_test():
       logger.info('Screen already in expected state.')
       return
     self.SendKeyEvent(keyevent.KEYCODE_POWER)
     timeout_retry.WaitFor(screen_test, wait_period=1)