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

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

Change-Id: Ie2fe000d93f3edd0e3c8ac0d049850d7c9510c01
This commit is contained in:
John Reck
2021-03-23 20:08:12 +00:00
committed by Automerger Merge Worker

View File

@@ -1196,13 +1196,11 @@ public class Typeface {
/** @hide */
public boolean isSupportedAxes(int axis) {
if (mSupportedAxes == null) {
synchronized (this) {
synchronized (this) {
if (mSupportedAxes == null) {
mSupportedAxes = nativeGetSupportedAxes(native_instance);
if (mSupportedAxes == null) {
mSupportedAxes = nativeGetSupportedAxes(native_instance);
if (mSupportedAxes == null) {
mSupportedAxes = EMPTY_AXES;
}
mSupportedAxes = EMPTY_AXES;
}
}
}