Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Debug][Font] We need know which font leads to system_server crash." am: a886856046 am: 5bee73637d am: 8394aa23e9 am: c723ca3435

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

Change-Id: I07b65b67eb074b9004fa2da05401b3967ad0c05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
John Reck
2023-03-07 20:56:16 +00:00
committed by Automerger Merge Worker
parent 06e574f163 c723ca3435
commit 1e819b80e7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/jni/fonts/Font.cpp
View File

@@ -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());