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

Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-12-14 18:23:10 +00:00
committed by Android (Google) Code Review
parent b152876f2d fbf2adaf6e
commit c20a6d99c5
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/app/SharedPreferencesImpl.java
View File

@@ -592,17 +592,17 @@ final class SharedPreferencesImpl implements SharedPreferences {
if (mFile.exists()) { if (mFile.exists()) {
boolean needsWrite = false; boolean needsWrite = false;
if (isFromSyncCommit) { // Only need to write if the disk state is older than this commit
// Only need to write if the disk state is older than this commit if (mDiskStateGeneration < mcr.memoryStateGeneration) {
if (mDiskStateGeneration < mcr.memoryStateGeneration) { if (isFromSyncCommit) {
needsWrite = true; needsWrite = true;
} } else {
} else { synchronized (this) {
synchronized (this) { // No need to persist intermediate states. Just wait for the latest state to
// No need to persist intermediate states. Just wait for the latest state to be // be persisted.
// persisted. if (mCurrentMemoryStateGeneration == mcr.memoryStateGeneration) {
if (mCurrentMemoryStateGeneration == mcr.memoryStateGeneration) { needsWrite = true;
needsWrite = true; }
} }
} }
} }