Merge "Do not write if apply() did not change the file." (60b98d39) · Commits · e / os / android_frameworks_base

core/java/android/app/SharedPreferencesImpl.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -592,20 +592,20 @@ final class SharedPreferencesImpl implements SharedPreferences {
		if (mFile.exists()) {
		boolean needsWrite = false;

		if (isFromSyncCommit) {
		// Only need to write if the disk state is older than this commit
		if (mDiskStateGeneration < mcr.memoryStateGeneration) {
		if (isFromSyncCommit) {
		needsWrite = true;
		}
		} else {
		synchronized (this) {
		// No need to persist intermediate states. Just wait for the latest state to be
		// persisted.
		// No need to persist intermediate states. Just wait for the latest state to
		// be persisted.
		if (mCurrentMemoryStateGeneration == mcr.memoryStateGeneration) {
		needsWrite = true;
		}
		}
		}
		}

		if (!needsWrite) {
		if (DEBUG) {