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

Merge "Fix mStringBlocks race in the AssetManager"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-24 00:41:58 +00:00
committed by Android (Google) Code Review
parent 824498943a 22723ffaba
commit 8a362bb9a5
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/android/content/res/AssetManager.java
View File

@@ -222,19 +222,21 @@ public final class AssetManager implements AutoCloseable {
*/
final boolean getResourceValue(@AnyRes int resId, int densityDpi, @NonNull TypedValue outValue,
boolean resolveRefs) {
final int block = loadResourceValue(resId, (short) densityDpi, outValue, resolveRefs);
if (block < 0) {
return false;
}
synchronized (this) {
final int block = loadResourceValue(resId, (short) densityDpi, outValue, resolveRefs);
if (block < 0) {
return false;
}
// Convert the changing configurations flags populated by native code.
outValue.changingConfigurations = ActivityInfo.activityInfoConfigNativeToJava(
outValue.changingConfigurations);
// Convert the changing configurations flags populated by native code.
outValue.changingConfigurations = ActivityInfo.activityInfoConfigNativeToJava(
outValue.changingConfigurations);
if (outValue.type == TypedValue.TYPE_STRING) {
outValue.string = mStringBlocks[block].get(outValue.data);
if (outValue.type == TypedValue.TYPE_STRING) {
outValue.string = mStringBlocks[block].get(outValue.data);
}
return true;
}
return true;
}
/**
@@ -244,18 +246,20 @@ public final class AssetManager implements AutoCloseable {
* @param resId the resource id of the string array
*/
final CharSequence[] getResourceTextArray(@ArrayRes int resId) {
final int[] rawInfoArray = getArrayStringInfo(resId);
final int rawInfoArrayLen = rawInfoArray.length;
final int infoArrayLen = rawInfoArrayLen / 2;
int block;
int index;
final CharSequence[] retArray = new CharSequence[infoArrayLen];
for (int i = 0, j = 0; i < rawInfoArrayLen; i = i + 2, j++) {
block = rawInfoArray[i];
index = rawInfoArray[i + 1];
retArray[j] = index >= 0 ? mStringBlocks[block].get(index) : null;
synchronized (this) {
final int[] rawInfoArray = getArrayStringInfo(resId);
final int rawInfoArrayLen = rawInfoArray.length;
final int infoArrayLen = rawInfoArrayLen / 2;
int block;
int index;
final CharSequence[] retArray = new CharSequence[infoArrayLen];
for (int i = 0, j = 0; i < rawInfoArrayLen; i = i + 2, j++) {
block = rawInfoArray[i];
index = rawInfoArray[i + 1];
retArray[j] = index >= 0 ? mStringBlocks[block].get(index) : null;
}
return retArray;
}
return retArray;
}
/**
@@ -320,8 +324,10 @@ public final class AssetManager implements AutoCloseable {
}
/*package*/ final CharSequence getPooledStringForCookie(int cookie, int id) {
// Cookies map to string blocks starting at 1.
return mStringBlocks[cookie - 1].get(id);
synchronized (this) {
// Cookies map to string blocks starting at 1.
return mStringBlocks[cookie - 1].get(id);
}
}
/**