ART: Do not JNI abort on nullptr GetObjectRefType
A nullptr is a valid input, as it is different from a null reference.
Bug: 18820997
(cherry picked from commit a87630724ef4f8760684fa69c8ecc685735aff88)
Change-Id: Ibda8907ba13b20d2055049492a356ffdf4ddc714
diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc
index 8ae28cd..6bf14ce 100644
--- a/runtime/jni_internal_test.cc
+++ b/runtime/jni_internal_test.cc
@@ -1023,10 +1023,11 @@
// TODO: invoke a native method and test that its arguments are considered local references.
- // Null as object should fail.
- CheckJniAbortCatcher jni_abort_catcher;
+ // Null as pointer should not fail and return invalid-ref. b/18820997
EXPECT_EQ(JNIInvalidRefType, env_->GetObjectRefType(nullptr));
- jni_abort_catcher.Check("java_object == null");
+
+ // TODO: Null as reference should return the original type.
+ // This requires running a GC so a non-null object gets freed.
}
TEST_F(JniInternalTest, StaleWeakGlobal) {