Merge "Explicitly flush compress/encrypt stream before close" into nyc-mr1-dev

2016-07-12 22:46:59 +00:00
parent 4885b274c1 59397a8e05
commit 69818781f3
1 changed files with 4 additions and 1 deletions
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -4328,7 +4328,10 @@ public class BackupManagerService {
                Slog.e(TAG, "Internal exception during full backup", e);
            } finally {
                try {
-                    if (out != null) out.close();
+                    if (out != null) {
+                        out.flush();
+                        out.close();
+                    }
                    mOutputFile.close();
                } catch (IOException e) {
                    /* nothing we can do about this */