Merge "Remove jniGetReferent from libnativehelper." am: 80af3ff83c am: 366f1753fc am: a618649905 am: 8d3a927cad
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1437134
Change-Id: If91486ea386f6e7ec85dcdc0ca1756b1d0a698e9
diff --git a/JNIHelp.c b/JNIHelp.c
index 6d98fb7..159feb0 100644
--- a/JNIHelp.c
+++ b/JNIHelp.c
@@ -317,11 +317,6 @@
return jniThrowException(env, "java/io/IOException", message);
}
-jobject jniGetReferent(JNIEnv* env, jobject ref) {
- jmethodID get = FindMethod(env, "java/lang/ref/Reference", "get", "()Ljava/lang/Object;");
- return (*env)->CallObjectMethod(env, ref, get);
-}
-
jstring jniCreateString(JNIEnv* env, const jchar* unicodeChars, jsize len) {
return (*env)->NewString(env, unicodeChars, len);
}
diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index 6d827b9..d95670c 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/include/nativehelper/JNIHelp.h
@@ -93,11 +93,6 @@
int jniThrowIOException(C_JNIEnv* env, int errnum);
/*
- * Returns the reference from a java.lang.ref.Reference.
- */
-jobject jniGetReferent(C_JNIEnv* env, jobject ref);
-
-/*
* Returns a Java String object created from UTF-16 data either from jchar or,
* if called from C++11, char16_t (a bitwise identical distinct type).
*/
@@ -148,10 +143,6 @@
return jniThrowIOException(&env->functions, errnum);
}
-inline jobject jniGetReferent(JNIEnv* env, jobject ref) {
- return jniGetReferent(&env->functions, ref);
-}
-
inline jstring jniCreateString(JNIEnv* env, const jchar* unicodeChars, jsize len) {
return jniCreateString(&env->functions, unicodeChars, len);
}
diff --git a/libnativehelper.map.txt b/libnativehelper.map.txt
index 6b6c0d3..2664647 100644
--- a/libnativehelper.map.txt
+++ b/libnativehelper.map.txt
@@ -24,7 +24,6 @@
jniGetNioBufferBaseArrayOffset; # apex
jniGetNioBufferPointer; # apex
jniGetNioBufferFields; # apex
- jniGetReferent; # apex
jniCreateString; # apex
jniLogException; # apex
jniUninitializeConstants; # apex
diff --git a/tests_mts/jni/jni_helper_jni.cpp b/tests_mts/jni/jni_helper_jni.cpp
index 8b5e147..cfb28bd 100644
--- a/tests_mts/jni/jni_helper_jni.cpp
+++ b/tests_mts/jni/jni_helper_jni.cpp
@@ -177,10 +177,6 @@
}
}
-static jobject getReferent(JNIEnv* env, jclass /*clazz*/, jobject reference) {
- return jniGetReferent(env, reference);
-}
-
static jstring createString(JNIEnv* env, jclass /*clazz*/, jstring value) {
ScopedStringChars ssc(env, value);
return jniCreateString(env, ssc.get(), ssc.size());
@@ -249,9 +245,6 @@
MAKE_JNI_NATIVE_METHOD("assertBufferPointer",
"(Ljava/nio/Buffer;J)V",
assertBufferPointer),
- MAKE_JNI_NATIVE_METHOD("getReferent",
- "(Ljava/lang/ref/Reference;)Ljava/lang/Object;",
- getReferent),
MAKE_JNI_NATIVE_METHOD("createString",
"(Ljava/lang/String;)Ljava/lang/String;",
createString),
diff --git a/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java b/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java
index 1fac3ac..e03a3d3 100644
--- a/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java
+++ b/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java
@@ -55,7 +55,6 @@
private static native long getDirectBufferAddress(Buffer b);
private static native void assertBufferPointer(Buffer b, long address);
- private static native Object getReferent(Reference r);
private static native String createString(String input);
static {
@@ -282,14 +281,6 @@
checkNioXHeapBuffers(bb, 0);
}
- public void testGetReferent() {
- Object o = new Object();
- SoftReference r = new SoftReference<>(o);
- assertSame(getReferent(r), o);
- r.clear();
- assertSame(getReferent(r), null);
- }
-
public void testCreateString() {
String input = "The treacherous mountain path lay ahead.";
String output = createString(input);
