drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor SharedPreference clean-up." into gingerbread

Browse Source
This commit is contained in:
Brad Fitzpatrick
2010-10-08 15:35:45 -07:00
committed by Android (Google) Code Review
parent 62d8874eb7 9acdeb99c5
commit a4682ed754
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/ContextImpl.java
View File

@ -2739,14 +2739,15 @@ class ContextImpl extends Context {
private final File mBackupFile; private final File mBackupFile;
private final int mMode; private final int mMode;
private Map<String, Object> mMap; // guarded by 'this' private Map<String, Object> mMap; // guarded by 'this'
private long mTimestamp; // guarded by 'this'
private int mDiskWritesInFlight = 0; // guarded by 'this' private int mDiskWritesInFlight = 0; // guarded by 'this'
private boolean mLoaded = false; // guarded by 'this' private boolean mLoaded = false; // guarded by 'this'
private long mStatTimestamp; // guarded by 'this'
private long mStatSize; // guarded by 'this'
private final Object mWritingToDiskLock = new Object(); private final Object mWritingToDiskLock = new Object();
private static final Object mContent = new Object(); private static final Object mContent = new Object();
private WeakHashMap<OnSharedPreferenceChangeListener, Object> mListeners; private final WeakHashMap<OnSharedPreferenceChangeListener, Object> mListeners;
SharedPreferencesImpl( SharedPreferencesImpl(
File file, int mode, Map initialContents) { File file, int mode, Map initialContents) {
@ -2757,7 +2758,7 @@ class ContextImpl extends Context {
mMap = initialContents != null ? initialContents : new HashMap<String, Object>(); mMap = initialContents != null ? initialContents : new HashMap<String, Object>();
FileStatus stat = new FileStatus(); FileStatus stat = new FileStatus();
if (FileUtils.getFileStatus(file.getPath(), stat)) { if (FileUtils.getFileStatus(file.getPath(), stat)) {
mTimestamp = stat.mtime; mStatTimestamp = stat.mtime;
} }
mListeners = new WeakHashMap<OnSharedPreferenceChangeListener, Object>(); mListeners = new WeakHashMap<OnSharedPreferenceChangeListener, Object>();
} }
@ -2784,7 +2785,7 @@ class ContextImpl extends Context {
return true; return true;
} }
synchronized (this) { synchronized (this) {
return mTimestamp != stat.mtime; return mStatTimestamp != stat.mtime || mStatSize != stat.size;
} }
} }
@ -3165,7 +3166,8 @@ class ContextImpl extends Context {
FileStatus stat = new FileStatus(); FileStatus stat = new FileStatus();
if (FileUtils.getFileStatus(mFile.getPath(), stat)) { if (FileUtils.getFileStatus(mFile.getPath(), stat)) {
synchronized (this) { synchronized (this) {
mTimestamp = stat.mtime; mStatTimestamp = stat.mtime;
mStatSize = stat.size;
} }
} }
// Writing was successful, delete the backup file if there is one. // Writing was successful, delete the backup file if there is one.