Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread

Browse Source 
Merge commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f' into gingerbread-plus-aosp

* commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f':
  Minor SharedPreference clean-up.
This commit is contained in:
Brad Fitzpatrick
2010-10-08 15:51:32 -07:00
committed by Android Git Automerger
parent 681f327e83 a4682ed754
commit 4216c3c3f7
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

@@ -2737,14 +2737,15 @@ class ContextImpl extends Context {
private final File mBackupFile;
private final int mMode;
private Map<String, Object> mMap; // guarded by 'this'
private long mTimestamp; // guarded by 'this'
private Map<String, Object> mMap; // 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 static final Object mContent = new Object();
private WeakHashMap<OnSharedPreferenceChangeListener, Object> mListeners;
private final WeakHashMap<OnSharedPreferenceChangeListener, Object> mListeners;
SharedPreferencesImpl(
File file, int mode, Map initialContents) {
@@ -2755,7 +2756,7 @@ class ContextImpl extends Context {
mMap = initialContents != null ? initialContents : new HashMap<String, Object>();
FileStatus stat = new FileStatus();
if (FileUtils.getFileStatus(file.getPath(), stat)) {
mTimestamp = stat.mtime;
mStatTimestamp = stat.mtime;
}
mListeners = new WeakHashMap<OnSharedPreferenceChangeListener, Object>();
}
@@ -2782,7 +2783,7 @@ class ContextImpl extends Context {
return true;
}
synchronized (this) {
return mTimestamp != stat.mtime;
return mStatTimestamp != stat.mtime || mStatSize != stat.size;
}
}
@@ -3163,7 +3164,8 @@ class ContextImpl extends Context {
FileStatus stat = new FileStatus();
if (FileUtils.getFileStatus(mFile.getPath(), stat)) {
synchronized (this) {
mTimestamp = stat.mtime;
mStatTimestamp = stat.mtime;
mStatSize = stat.size;
}
}
// Writing was successful, delete the backup file if there is one.