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

Commit 3e66bb91 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "[Debug][Font] We need know which font leads to system_server crash."... 

Merge "[Debug][Font] We need know which font leads to system_server crash." am: a8868560 am: 5bee7363 am: 8394aa23 am: c723ca34

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



Change-Id: Ie3bdd19f6042a4de028c79acaca8bb0621161d19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1464250e c723ca34

libs/hwui/jni/fonts/Font.cpp

+3 −2
Original line number Diff line number Diff line
@@ -108,8 +108,9 @@ static jlong Font_Builder_build(JNIEnv* env, jobject clazz, jlong builderPtr, jo 
        std::move(data), std::string_view(fontPath.c_str(), fontPath.size()),

        fontPtr, fontSize, ttcIndex, builder->axes);

    if (minikinFont == nullptr) {

        jniThrowException(env, "java/lang/IllegalArgumentException",

                          "Failed to create internal object. maybe invalid font data.");

        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                             "Failed to create internal object. maybe invalid font data. filePath %s",

                             fontPath.c_str());

        return 0;

    }

    uint32_t localeListId = minikin::registerLocaleList(langTagStr.c_str());