Remove jniGetReferent from libnativehelper.

It is moving to frameworks/base.

Bug: 168471625
Test: m
Change-Id: I29e44b96aa4933bd07ea2225b42e8d47f5f972da

5 files changed, 0 insertions, 31 deletions

diff --git a/JNIHelp.c b/JNIHelp.c
index fdc309e..6af053d 100644
--- a/JNIHelp.c
+++ b/JNIHelp.c
@@ -317,11 +317,6 @@ int jniThrowIOException(JNIEnv* env, int errnum) {
     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 ad6eb25..2ea4186 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/include/nativehelper/JNIHelp.h
@@ -93,11 +93,6 @@ int jniThrowRuntimeException(C_JNIEnv* env, const char* msg);
 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).
  */
@@ -157,10 +152,6 @@ inline int jniThrowIOException(JNIEnv* env, int errnum) {
     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 5ecdd6d..977b96b 100644
--- a/libnativehelper.map.txt
+++ b/libnativehelper.map.txt
@@ -24,7 +24,6 @@ LIBNATIVEHELPER_S { # introduced=S
     jniGetNioBufferBaseArrayOffset; # apex
     jniGetNioBufferPointer; # apex
     jniGetNioBufferFields; # apex
-    jniGetReferent; # apex
     jniCreateString; # apex
     jniCreateStringArray; # apex
     jniLogException; # apex
diff --git a/tests_mts/jni/jni_helper_jni.cpp b/tests_mts/jni/jni_helper_jni.cpp
index 16f73cd..41f5521 100644
--- a/tests_mts/jni/jni_helper_jni.cpp
+++ b/tests_mts/jni/jni_helper_jni.cpp
@@ -177,10 +177,6 @@ static void assertBufferPointer(JNIEnv* env, jclass /*clazz*/, jobject jnb, jlon
     }
 }
 
-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());
@@ -253,9 +249,6 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         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 ffcf3b1..7bd1473 100644
--- a/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java
+++ b/tests_mts/src/android/libnativehelper/mts/JniHelpTest.java
@@ -55,7 +55,6 @@ public class JniHelpTest extends AndroidTestCase {
     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);
     private static native String[] createStringArray(int length);
 
@@ -283,14 +282,6 @@ public class JniHelpTest extends AndroidTestCase {
         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);