Merge "Fix issue #5435470: SharedPreferencesImpl should read from file..."
diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java
index 8aee65c..615e8ce 100644
--- a/core/java/android/app/SharedPreferencesImpl.java
+++ b/core/java/android/app/SharedPreferencesImpl.java
@@ -29,6 +29,7 @@
 
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -107,7 +108,8 @@
         FileStatus stat = new FileStatus();
         if (FileUtils.getFileStatus(mFile.getPath(), stat) && mFile.canRead()) {
             try {
-                FileInputStream str = new FileInputStream(mFile);
+                BufferedInputStream str = new BufferedInputStream(
+                        new FileInputStream(mFile), 16*1024);
                 map = XmlUtils.readMapXml(str);
                 str.close();
             } catch (XmlPullParserException e) {