Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7427d997 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie2fe000d93f3edd0e3c8ac0d049850d7c9510c01
parents 15d9a3ab 66fc99d5

graphics/java/android/graphics/Typeface.java

+4 −6
Original line number Diff line number Diff line
@@ -1196,7 +1196,6 @@ public class Typeface { 


    /** @hide */

    public boolean isSupportedAxes(int axis) {

        if (mSupportedAxes == null) {

        synchronized (this) {

            if (mSupportedAxes == null) {

                mSupportedAxes = nativeGetSupportedAxes(native_instance);
@@ -1205,7 +1204,6 @@ public class Typeface { 
                }

            }

        }

        }

        return Arrays.binarySearch(mSupportedAxes, axis) >= 0;

    }