Merge "Make InputMethodSubtype thread safe" into jb-dev (05f5236f) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodSubtype.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public final class InputMethodSubtype implements Parcelable {
		private final String mSubtypeLocale;
		private final String mSubtypeMode;
		private final String mSubtypeExtraValue;
		private HashMap<String, String> mExtraValueHashMapCache;
		private volatile HashMap<String, String> mExtraValueHashMapCache;

		/**
		* Constructor.
		@@ -236,6 +236,8 @@ 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);
		@@ -252,6 +254,8 @@ public final class InputMethodSubtype implements Parcelable {
		}
		}
		}
		}
		}
		return mExtraValueHashMapCache;
		}