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

Commit 49a6e505 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Automerger Merge Worker
Browse files

Merge "Make Typeface member final" into sc-dev am: 8ae6cd8c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib887bcc7d5a9b88e3cc307ea4056ae5c66b3eba2
parents 88f3a97c 8ae6cd8c

graphics/java/android/graphics/Typeface.java

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class Typeface { 
    @UnsupportedAppUsage

    public final long native_instance;



    private Runnable mCleaner;

    private final Runnable mCleaner;



    /** @hide */

    @IntDef(value = {NORMAL, BOLD, ITALIC, BOLD_ITALIC})
@@ -189,9 +189,9 @@ public class Typeface { 
    /** @hide */ public static final int STYLE_MASK = 0x03;



    @UnsupportedAppUsage

    private @Style int mStyle = 0;

    private @Style final int mStyle;



    private @IntRange(from = 0, to = FontStyle.FONT_WEIGHT_MAX) int mWeight = 0;

    private @IntRange(from = 0, to = FontStyle.FONT_WEIGHT_MAX) final int mWeight;



    // Value for weight and italic. Indicates the value is resolved by font metadata.

    // Must be the same as the C++ constant in core/jni/android/graphics/FontFamily.cpp