Merge "Fix thread-shared field evades lock acquisition reported by Coverity" am: 66fc99d578 am: 7427d997f6 am: 7ed71bc418
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646974 Change-Id: Ifa2be5367a1afcb9803fe129951cf6c66ce30cc0
This commit is contained in:
@@ -1441,13 +1441,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user