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

Merge "Fix double-checked locking in InputMethodSubtype" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-28 17:46:10 +00:00
committed by Android (Google) Code Review
parent d686e9c26e da5790de78
commit da93d0ea9b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/android/view/inputmethod/InputMethodSubtype.java
View File

@@ -520,27 +520,27 @@ public final class InputMethodSubtype implements Parcelable {
} }
private HashMap<String, String> getExtraValueHashMap() { private HashMap<String, String> getExtraValueHashMap() {
if (mExtraValueHashMapCache == null) { synchronized (this) {
synchronized(this) { HashMap<String, String> extraValueMap = mExtraValueHashMapCache;
if (mExtraValueHashMapCache == null) { if (extraValueMap != null) {
mExtraValueHashMapCache = new HashMap<String, String>(); return extraValueMap;
final String[] pairs = mSubtypeExtraValue.split(EXTRA_VALUE_PAIR_SEPARATOR); }
final int N = pairs.length; extraValueMap = new HashMap<>();
for (int i = 0; i < N; ++i) { final String[] pairs = mSubtypeExtraValue.split(EXTRA_VALUE_PAIR_SEPARATOR);
final String[] pair = pairs[i].split(EXTRA_VALUE_KEY_VALUE_SEPARATOR); for (int i = 0; i < pairs.length; ++i) {
if (pair.length == 1) { final String[] pair = pairs[i].split(EXTRA_VALUE_KEY_VALUE_SEPARATOR);
mExtraValueHashMapCache.put(pair[0], null); if (pair.length == 1) {
} else if (pair.length > 1) { extraValueMap.put(pair[0], null);
if (pair.length > 2) { } else if (pair.length > 1) {
Slog.w(TAG, "ExtraValue has two or more '='s"); if (pair.length > 2) {
} Slog.w(TAG, "ExtraValue has two or more '='s");
mExtraValueHashMapCache.put(pair[0], pair[1]);
}
} }
extraValueMap.put(pair[0], pair[1]);
} }
} }
mExtraValueHashMapCache = extraValueMap;
return extraValueMap;
} }
return mExtraValueHashMapCache;
} }
/** /**