summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-02-17 17:04:01 -0800
committerThe Android Automerger <android-build@google.com>2015-02-18 20:57:17 -0800
commit4cbffa6f43e9d74827f9c9bb481a5d759ef7a1a3 (patch)
tree89380a03f90f9e768b5c4a877d2129f057e7e2a3
parentc031561475959b3632d521566bbf1af8f806987d (diff)
downloadbase-4cbffa6f43e9d74827f9c9bb481a5d759ef7a1a3.tar.gz
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
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java1
1 files changed, 1 insertions, 0 deletions
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;