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

Merge "Add arguments to native methods required for host builds" into sc-dev

Browse Source
This commit is contained in:
Jerome Gaillard
2021-02-09 18:31:50 +00:00
committed by Android (Google) Code Review
parent 351250ae4c b71861cdab
commit b3b1c4c3c9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ static jlong Font_getBufferAddress(CRITICAL_JNI_PARAMS_COMMA jlong fontPtr) {
}
// Critical Native
static jlong Font_getReleaseNativeFontFunc() {
static jlong Font_getReleaseNativeFontFunc(CRITICAL_JNI_PARAMS) {
return reinterpret_cast<jlong>(releaseFont);
}

4
libs/hwui/jni/fonts/FontFamily.cpp
View File

@@ -101,13 +101,13 @@ static jint FontFamily_getVariant(CRITICAL_JNI_PARAMS_COMMA jlong familyPtr) {
}
// CriticalNative
static jint FontFamily_getFontSize(jlong familyPtr) {
static jint FontFamily_getFontSize(CRITICAL_JNI_PARAMS_COMMA jlong familyPtr) {
FontFamilyWrapper* family = reinterpret_cast<FontFamilyWrapper*>(familyPtr);
return family->family->getNumFonts();
}
// CriticalNative
static jlong FontFamily_getFont(jlong familyPtr, jint index) {
static jlong FontFamily_getFont(CRITICAL_JNI_PARAMS_COMMA jlong familyPtr, jint index) {
FontFamilyWrapper* family = reinterpret_cast<FontFamilyWrapper*>(familyPtr);
std::shared_ptr<minikin::Font> font = family->family->getFontRef(index);
return reinterpret_cast<jlong>(new FontWrapper(std::move(font)));