Skip to content

Commit a0dca0c

Browse files
author
Jonah Williams
authored
[Android] add missing null check to java object for hcpp mode. (#163165)
This can be hit if the FlutterJNI has been disconnected. In this case, it is correct to return a nullptr as the engine can create its own trasnaction.
1 parent 1c0a76d commit a0dca0c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,16 +2023,18 @@ ASurfaceTransaction* PlatformViewAndroidJNIImpl::createTransaction() {
20232023
JNIEnv* env = fml::jni::AttachCurrentThread();
20242024

20252025
auto java_object = java_object_.get(env);
2026+
if (java_object.is_null()) {
2027+
return nullptr;
2028+
}
20262029

20272030
fml::jni::ScopedJavaLocalRef<jobject> transaction(
20282031
env,
20292032
env->CallObjectMethod(java_object.obj(), g_create_transaction_method));
2030-
20312033
if (transaction.is_null()) {
20322034
return nullptr;
20332035
}
2034-
20352036
FML_CHECK(fml::jni::CheckException(env));
2037+
20362038
return impeller::android::GetProcTable().ASurfaceTransaction_fromJava(
20372039
env, transaction.obj());
20382040
}

0 commit comments

Comments
 (0)