summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-02-18 02:23:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-18 02:23:06 +0000
commit32f216c359540219905bbe0295da31e594d83f5f (patch)
tree1adf5327ee65ef437beff46aa00388f94adb674b /packages/SettingsProvider
parent27672017956f5bb672cab15d0f0094018b6fa9d9 (diff)
parent8cd95aba2f97eb552d437c185b156ba964886a6e (diff)
downloadframeworks_base-32f216c359540219905bbe0295da31e594d83f5f.zip
frameworks_base-32f216c359540219905bbe0295da31e594d83f5f.tar.gz
frameworks_base-32f216c359540219905bbe0295da31e594d83f5f.tar.bz2
am 8cd95aba: am 56238eaa: am 129ea76a: Fix wifi AP backup
* commit '8cd95aba2f97eb552d437c185b156ba964886a6e': Fix wifi AP backup
Diffstat (limited to 'packages/SettingsProvider')
-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 6b7ac8c..b4d8c63 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;