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 
am: da93d0ea9b

Change-Id: I9b2399fab63825f693be1b8778f4a07fccce6c8f
This commit is contained in:
Tadashi G. Takaoka
2017-03-28 17:52:38 +00:00
committed by android-build-merger
parent 4573fc8450 da93d0ea9b
commit a55b021729
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() {
if (mExtraValueHashMapCache == null) {
synchronized(this) {
if (mExtraValueHashMapCache == null) {
mExtraValueHashMapCache = new HashMap<String, String>();
final String[] pairs = mSubtypeExtraValue.split(EXTRA_VALUE_PAIR_SEPARATOR);
final int N = pairs.length;
for (int i = 0; i < N; ++i) {
final String[] pair = pairs[i].split(EXTRA_VALUE_KEY_VALUE_SEPARATOR);
if (pair.length == 1) {
mExtraValueHashMapCache.put(pair[0], null);
} else if (pair.length > 1) {
if (pair.length > 2) {
Slog.w(TAG, "ExtraValue has two or more '='s");
}
mExtraValueHashMapCache.put(pair[0], pair[1]);
}
synchronized (this) {
HashMap<String, String> extraValueMap = mExtraValueHashMapCache;
if (extraValueMap != null) {
return extraValueMap;
}
extraValueMap = new HashMap<>();
final String[] pairs = mSubtypeExtraValue.split(EXTRA_VALUE_PAIR_SEPARATOR);
for (int i = 0; i < pairs.length; ++i) {
final String[] pair = pairs[i].split(EXTRA_VALUE_KEY_VALUE_SEPARATOR);
if (pair.length == 1) {
extraValueMap.put(pair[0], null);
} else if (pair.length > 1) {
if (pair.length > 2) {
Slog.w(TAG, "ExtraValue has two or more '='s");
}
extraValueMap.put(pair[0], pair[1]);
}
}
mExtraValueHashMapCache = extraValueMap;
return extraValueMap;
}
return mExtraValueHashMapCache;
}
/**