summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-02-18 11:39:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-18 11:39:01 +0000
commit8561ff98cdcfcc930630c72b2dc876cc5c1a8cb2 (patch)
tree52520c2fb0c27a28719751e857675748c361308b /packages/SettingsProvider
parent90fa535569b5676a61bf5c9585da04f1c46bf85e (diff)
parent32f216c359540219905bbe0295da31e594d83f5f (diff)
downloadframeworks_base-8561ff98cdcfcc930630c72b2dc876cc5c1a8cb2.zip
frameworks_base-8561ff98cdcfcc930630c72b2dc876cc5c1a8cb2.tar.gz
frameworks_base-8561ff98cdcfcc930630c72b2dc876cc5c1a8cb2.tar.bz2
am 32f216c3: am 8cd95aba: am 56238eaa: am 129ea76a: Fix wifi AP backup
* commit '32f216c359540219905bbe0295da31e594d83f5f': 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 8371117..78f6ace 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -941,6 +941,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;