From 2d33d70352c3e339d7abef5aa2598247e79307c9 Mon Sep 17 00:00:00 2001 From: Xu Qian Date: Mon, 22 Mar 2021 12:55:25 +0800 Subject: Fix thread-shared field evades lock acquisition reported by Coverity Change-Id: Ia351e2ddc79a3f8e1b47ed1e697a2d24b2a3ebe7 --- graphics/java/android/graphics/Typeface.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index fe5c1be05927..d048efcfd12c 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -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; } } } -- cgit v1.2.3-59-g8ed1b