Merge "Fix thread-shared field evades lock acquisition reported by Coverity" (66fc99d5) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Typeface.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -1196,7 +1196,6 @@ public class Typeface {

		/** @hide */
		public boolean isSupportedAxes(int axis) {
		if (mSupportedAxes == null) {
		synchronized (this) {
		if (mSupportedAxes == null) {
		mSupportedAxes = nativeGetSupportedAxes(native_instance);
		@@ -1205,7 +1204,6 @@ public class Typeface {
		}
		}
		}
		}
		return Arrays.binarySearch(mSupportedAxes, axis) >= 0;
		}