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

Merge "Fix NativeThemeRebase null abort" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 22:17:48 +00:00
committed by Android (Google) Code Review
parent eb87259110 489d49d325
commit 46bf419ba2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_util_AssetManager.cpp
View File

@@ -1282,6 +1282,8 @@ static void NativeThemeRebase(JNIEnv* env, jclass /*clazz*/, jlong ptr, jlong th
if (style_id_args == nullptr) { if (style_id_args == nullptr) {
return; return;
} }
} else {
CHECK(style_count == 0) << "style_ids is null while style_count is non-zero";
} }
jboolean* force_args = nullptr; jboolean* force_args = nullptr;
@@ -1292,13 +1294,19 @@ static void NativeThemeRebase(JNIEnv* env, jclass /*clazz*/, jlong ptr, jlong th
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT); env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
return; return;
} }
} else {
CHECK(style_count == 0) << "force is null while style_count is non-zero";
} }
auto theme = reinterpret_cast<Theme*>(theme_ptr); auto theme = reinterpret_cast<Theme*>(theme_ptr);
theme->Rebase(&(*assetmanager), style_id_args, force_args, static_cast<size_t>(style_count)); theme->Rebase(&(*assetmanager), style_id_args, force_args, static_cast<size_t>(style_count));
if (style_ids != nullptr) {
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT); env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
}
if (force != nullptr) {
env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT); env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
} }
}
static void NativeThemeCopy(JNIEnv* env, jclass /*clazz*/, jlong dst_asset_manager_ptr, static void NativeThemeCopy(JNIEnv* env, jclass /*clazz*/, jlong dst_asset_manager_ptr,
jlong dst_theme_ptr, jlong src_asset_manager_ptr, jlong src_theme_ptr) { jlong dst_theme_ptr, jlong src_asset_manager_ptr, jlong src_theme_ptr) {