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

Commit 8fa4e29f authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle... 

am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev

* commit '23b7bc1b':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
parents 457767d2 23b7bc1b

core/jni/android/graphics/Typeface.cpp

+7 −5
Original line number Diff line number Diff line
@@ -29,15 +29,17 @@ private: 


static SkTypeface* Typeface_create(JNIEnv* env, jobject, jstring name,

                                   SkTypeface::Style style) {

    SkTypeface* face;

    SkTypeface* face = NULL;



    if (NULL == name) {

        face = SkTypeface::CreateFromName(NULL, (SkTypeface::Style)style);

    }

    else {

    if (NULL != name) {

        AutoJavaStringToUTF8    str(env, name);

        face = SkTypeface::CreateFromName(str.c_str(), style);

    }



    // return the default font at the best style if no exact match exists

    if (NULL == face) {

        face = SkTypeface::CreateFromName(NULL, style);

    }

    return face;

}