Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6b290dc2cbb93837e74ea5040b359e72d22beab0
This commit is contained in:
John Reck
2021-03-23 20:28:06 +00:00
committed by Automerger Merge Worker
parent a32dc0fbe2 7427d997f6
commit 7ed71bc418
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/java/android/graphics/Typeface.java
View File

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