Commit 7ed71bc4 authored Mar 23, 2021 by John Reck Committed by Automerger Merge Worker Mar 23, 2021

Merge "Fix thread-shared field evades lock acquisition reported by Coverity"...

Merge "Fix thread-shared field evades lock acquisition reported by Coverity" am: 66fc99d5 am: 7427d997

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646974

Change-Id: I6b290dc2cbb93837e74ea5040b359e72d22beab0

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;
		}