merge from open-source master

Change-Id: If84d4054324db6d10fd0cdbd2169c039c6675726

1 files changed, 13 insertions, 1 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 3a61ace8..d2bd3220 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -695,8 +695,10 @@ http_request_loop:
                     FileUtils.setPermissions(filename, 0644, -1, -1);
 
                     // Sync to storage after completion
+                    FileOutputStream downloadedFileStream = null;
                     try {
-                        new FileOutputStream(filename, true).getFD().sync();
+                        downloadedFileStream = new FileOutputStream(filename, true);
+                        downloadedFileStream.getFD().sync();
                     } catch (FileNotFoundException ex) {
                         Log.w(Constants.TAG, "file " + filename + " not found: " + ex);
                     } catch (SyncFailedException ex) {
@@ -705,6 +707,16 @@ http_request_loop:
                         Log.w(Constants.TAG, "IOException trying to sync " + filename + ": " + ex);
                     } catch (RuntimeException ex) {
                         Log.w(Constants.TAG, "exception while syncing file: ", ex);
+                    } finally {
+                        if(downloadedFileStream != null) {
+                            try {
+                                downloadedFileStream.close();
+                            } catch (IOException ex) {
+                                Log.w(Constants.TAG, "IOException while closing synced file: ", ex);
+                            } catch (RuntimeException ex) {
+                                Log.w(Constants.TAG, "exception while closing file: ", ex);
+                            }
+                        }
                     }
                 }
             }