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

Commit 688a4c9e authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Automerger Merge Worker
Browse files

Merge "Add host required arguments to FontFamily_getVariant" into sc-dev am: 09b64443 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If379ad45014ba94d5b5bbac5849d247512fdbc0d
parents 2d33d896 09b64443

libs/hwui/jni/fonts/FontFamily.cpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static jstring FontFamily_getLangTags(JNIEnv* env, jobject, jlong familyPtr) { 
}



// CriticalNative

static jint FontFamily_getVariant(jlong familyPtr) {

static jint FontFamily_getVariant(CRITICAL_JNI_PARAMS_COMMA jlong familyPtr) {

    FontFamilyWrapper* family = reinterpret_cast<FontFamilyWrapper*>(familyPtr);

    return static_cast<jint>(family->family->variant());

}