[Android] Delete temporaries in SetProtectedFileContents.

build/android/pylib/android_commands.py

 # Copyright (c) 2012 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 an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 1154 matching lines @@
         AndroidCommands._TEMP_SCRIPT_FILE_BASE_FMT)
 
     # Put the contents in a temporary file
     self.SetFileContents(temp_file, contents)
     # Create a script to copy the file contents to its final destination
     self.SetFileContents(temp_script, 'cat %s > %s' % (temp_file, filename))
 
     command = 'sh %s' % temp_script
     command_runner = self._GetProtectedFileCommandRunner()
     if command_runner:
-      return command_runner(command)
+      command_runner(command)
     else:
       logging.warning('Could not set contents of protected file: %s' % filename)
 
     # And remove the temporary files
     self.RunShellCommand('rm ' + temp_file)

[craigdh, 2014/05/08 00:04:10]

this should probably be done as a try/finally to ensure these always get called.

     self.RunShellCommand('rm ' + temp_script)
 
   def RemovePushedFiles(self):
     """Removes all files pushed with PushIfNeeded() from the device."""
     for p in self._pushed_files:
       self.RunShellCommand('rm -r %s' % p, timeout_time=2 * 60)
 
   def ListPathContents(self, path):
     """Lists files in all subdirectories of |path|.
 
@@ skipping 772 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()