Commit 7dd3016e authored Mar 24, 2021 by John Reck Committed by Automerger Merge Worker Mar 24, 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 am: 7ed71bc4 am: 3a38f457

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

Change-Id: I5691a01de071c3bf301106c8435cfbd05f60f750

graphics/java/android/graphics/Typeface.java

+4 −6

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

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