From 4cbffa6f43e9d74827f9c9bb481a5d759ef7a1a3 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 17 Feb 2015 17:04:01 -0800 Subject: Fix wifi AP backup An OutputStream buffers only by explicit contract. OutputStreamWriter buffers internally, always. Do not get these behaviors confused. Bug 19341967 Change-Id: I0610ed625b0175620083dd286f3a73c24956b171 --- .../src/com/android/providers/settings/SettingsBackupAgent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 6b7ac8c626e2..b4d8c63370f8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -942,6 +942,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { ByteArrayOutputStream bos = new ByteArrayOutputStream(); OutputStreamWriter out = new OutputStreamWriter(bos); fromFile.write(out); + out.flush(); return bos.toByteArray(); } else { return EMPTY_DATA; -- cgit v1.2.3