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 am: 46bf419ba2

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

Change-Id: Ifcb171004e36968272d66cbc8d609370b07d382d
This commit is contained in:
TreeHugger Robot
2021-06-14 22:27:48 +00:00
committed by Automerger Merge Worker
parent 29c07ea91d 46bf419ba2
commit 36428edadb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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) {
return;
}
} else {
CHECK(style_count == 0) << "style_ids is null while style_count is non-zero";
}
jboolean* force_args = nullptr;
@@ -1292,12 +1294,18 @@ static void NativeThemeRebase(JNIEnv* env, jclass /*clazz*/, jlong ptr, jlong th
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
return;
}
} else {
CHECK(style_count == 0) << "force is null while style_count is non-zero";
}
auto theme = reinterpret_cast<Theme*>(theme_ptr);
theme->Rebase(&(*assetmanager), style_id_args, force_args, static_cast<size_t>(style_count));
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
if (style_ids != nullptr) {
env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
}
if (force != nullptr) {
env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
}
}
static void NativeThemeCopy(JNIEnv* env, jclass /*clazz*/, jlong dst_asset_manager_ptr,