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

Merge "Preload Roboto-Regualr.ttf" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-14 01:37:16 +00:00
committed by Android (Google) Code Review
parent bb62a307c0 1dbb19432e
commit 4c417f3bde
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/java/android/graphics/Typeface.java
View File

@@ -1346,6 +1346,19 @@ public class Typeface {
} }
} }
static {
// Preload Roboto-Regular.ttf in Zygote for improving app launch performance.
// TODO: add new attribute to fonts.xml to preload fonts in Zygote.
preloadFontFile("/system/fonts/Roboto-Regular.ttf");
}
private static void preloadFontFile(String filePath) {
File file = new File(filePath);
if (file.exists()) {
nativeWarmUpCache(filePath);
}
}
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
public static void destroySystemFontMap() { public static void destroySystemFontMap() {
@@ -1464,4 +1477,6 @@ public class Typeface {
private static native @Nullable long[] nativeReadTypefaces(@NonNull ByteBuffer buffer); private static native @Nullable long[] nativeReadTypefaces(@NonNull ByteBuffer buffer);
private static native void nativeForceSetStaticFinalField(String fieldName, Typeface typeface); private static native void nativeForceSetStaticFinalField(String fieldName, Typeface typeface);
private static native void nativeWarmUpCache(String fileName);
} }

7
libs/hwui/jni/Typeface.cpp
View File

@@ -367,6 +367,12 @@ static jlong Typeface_getFamily(CRITICAL_JNI_PARAMS_COMMA jlong faceHandle, jint
return reinterpret_cast<jlong>(new FontFamilyWrapper(std::move(family))); return reinterpret_cast<jlong>(new FontFamilyWrapper(std::move(family)));
} }
// Regular JNI
static void Typeface_warmUpCache(JNIEnv* env, jobject, jstring jFilePath) {
ScopedUtfChars filePath(env, jFilePath);
makeSkDataCached(filePath.c_str(), false /* fs verity */);
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static const JNINativeMethod gTypefaceMethods[] = { static const JNINativeMethod gTypefaceMethods[] = {
@@ -390,6 +396,7 @@ static const JNINativeMethod gTypefaceMethods[] = {
(void*)Typeface_forceSetStaticFinalField}, (void*)Typeface_forceSetStaticFinalField},
{"nativeGetFamilySize", "(J)I", (void*)Typeface_getFamilySize}, {"nativeGetFamilySize", "(J)I", (void*)Typeface_getFamilySize},
{"nativeGetFamily", "(JI)J", (void*)Typeface_getFamily}, {"nativeGetFamily", "(JI)J", (void*)Typeface_getFamily},
{"nativeWarmUpCache", "(Ljava/lang/String;)V", (void*)Typeface_warmUpCache},
}; };
int register_android_graphics_Typeface(JNIEnv* env) int register_android_graphics_Typeface(JNIEnv* env)