Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d99301c authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: 69818781

Change-Id: Ib31ffe531a4c6d27f10d1432c8ab68507c14abaf
parents bc15e3ca 69818781

services/backup/java/com/android/server/backup/BackupManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -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 */