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

Merge "Ensure the generation is not changed before put value to cache"

Browse Source
This commit is contained in:
Treehugger Robot
2017-08-28 19:42:11 +00:00
committed by Gerrit Code Review
parent c0d8300b32 a5db9b42ea
commit 11ae580f81
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/provider/Settings.java
View File

@@ -1734,6 +1734,10 @@ public final class Settings {
return true; return true;
} }
public int getCurrentGeneration() {
return mCurrentGeneration;
}
private int readCurrentGeneration() { private int readCurrentGeneration() {
try { try {
return mArray.get(mIndex); return mArray.get(mIndex);
@@ -1836,6 +1840,7 @@ public final class Settings {
public String getStringForUser(ContentResolver cr, String name, final int userHandle) { public String getStringForUser(ContentResolver cr, String name, final int userHandle) {
final boolean isSelf = (userHandle == UserHandle.myUserId()); final boolean isSelf = (userHandle == UserHandle.myUserId());
int currentGeneration = -1;
if (isSelf) { if (isSelf) {
synchronized (NameValueCache.this) { synchronized (NameValueCache.this) {
if (mGenerationTracker != null) { if (mGenerationTracker != null) {
@@ -1849,6 +1854,9 @@ public final class Settings {
} else if (mValues.containsKey(name)) { } else if (mValues.containsKey(name)) {
return mValues.get(name); return mValues.get(name);
} }
if (mGenerationTracker != null) {
currentGeneration = mGenerationTracker.getCurrentGeneration();
}
} }
} }
} else { } else {
@@ -1939,7 +1947,10 @@ public final class Settings {
}); });
} }
} }
mValues.put(name, value); if (mGenerationTracker != null && currentGeneration ==
mGenerationTracker.getCurrentGeneration()) {
mValues.put(name, value);
}
} }
} else { } else {
if (LOCAL_LOGV) Log.i(TAG, "call-query of user " + userHandle if (LOCAL_LOGV) Log.i(TAG, "call-query of user " + userHandle
@@ -1980,7 +1991,10 @@ public final class Settings {
String value = c.moveToNext() ? c.getString(0) : null; String value = c.moveToNext() ? c.getString(0) : null;
synchronized (NameValueCache.this) { synchronized (NameValueCache.this) {
mValues.put(name, value); if(mGenerationTracker != null &&
currentGeneration == mGenerationTracker.getCurrentGeneration()) {
mValues.put(name, value);
}
} }
if (LOCAL_LOGV) { if (LOCAL_LOGV) {
Log.v(TAG, "cache miss [" + mUri.getLastPathSegment() + "]: " + Log.v(TAG, "cache miss [" + mUri.getLastPathSegment() + "]: " +