DeviceUtils: Write checksums to cache even when not reading them

build/android/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 1121 matching lines @@
               posixpath.join(device_path, relative_dir, f) for f in filenames)
 
       def device_sums_helper():
         if self._enable_device_files_cache:
           cache_entry = self._cache['device_path_checksums'].get(device_path)
           if cache_entry and cache_entry[0] == ignore_other_files:
             return dict(cache_entry[1])
 
         sums = md5sum.CalculateDeviceMd5Sums(specific_device_paths, self)
 
-        if self._enable_device_files_cache:
-          cache_entry = [ignore_other_files, sums]
-          self._cache['device_path_checksums'][device_path] = cache_entry
+        cache_entry = [ignore_other_files, sums]
+        self._cache['device_path_checksums'][device_path] = cache_entry
         return dict(sums)
 
       host_checksums, device_checksums = reraiser_thread.RunAsync((
           lambda: md5sum.CalculateHostMd5Sums([host_path]),
           device_sums_helper))
     except EnvironmentError as e:
       logging.warning('Error calculating md5: %s', e)
       return ([(host_path, device_path)], [], [], lambda: 0)
 
     to_push = []
@@ skipping 11 matching lines @@
         device_abs_path = posixpath.join(
             device_path, os.path.relpath(host_abs_path, host_path))
         device_checksum = device_checksums.pop(device_abs_path, None)
         if device_checksum == host_checksum:
           up_to_date.append(host_abs_path)
         else:
           to_push.append((host_abs_path, device_abs_path))
       to_delete = device_checksums.keys()
 
     def cache_commit_func():
-      if not self._enable_device_files_cache:
-        return
       new_sums = {posixpath.join(device_path, path[len(host_path) + 1:]): val
                   for path, val in host_checksums.iteritems()}
       cache_entry = [ignore_other_files, new_sums]
       self._cache['device_path_checksums'][device_path] = cache_entry
 
     return (to_push, up_to_date, to_delete, cache_commit_func)
 
   def _ComputeDeviceChecksumsForApks(self, package_name):
     ret = self._cache['package_apk_checksums'].get(package_name)
     if ret is None:
@@ skipping 868 matching lines @@
     if ('android.permission.WRITE_EXTERNAL_STORAGE' in permissions
         and 'android.permission.READ_EXTERNAL_STORAGE' not in permissions):
       permissions.append('android.permission.READ_EXTERNAL_STORAGE')
     cmd = ';'.join('pm grant %s %s' %(package, p) for p in permissions)
     if cmd:
       output = self.RunShellCommand(cmd)
       if output:
         logging.warning('Possible problem when granting permissions. Blacklist '
                         'may need to be updated.')
         logging.warning(output)