Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f9532f4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #5435470: SharedPreferencesImpl should read from file..."

parents 9c518d1f 2e8fb73e

core/java/android/app/SharedPreferencesImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import dalvik.system.BlockGuard; 


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 @@ final class SharedPreferencesImpl implements SharedPreferences { 
        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) {