Merge "Remove unused global references in JNI code supporting HwBinder."
diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp
index 0c23797..40d49b7 100644
--- a/core/jni/android_os_HwBlob.cpp
+++ b/core/jni/android_os_HwBlob.cpp
@@ -83,12 +83,6 @@
mSize(size),
mOwnsBuffer(true),
mHandle(0) {
- jclass clazz = env->GetObjectClass(thiz);
- CHECK(clazz != NULL);
-
- mClass = (jclass)env->NewGlobalRef(clazz);
- mObject = env->NewWeakGlobalRef(thiz);
-
if (size > 0) {
mBuffer = malloc(size);
}
@@ -99,14 +93,6 @@
free(mBuffer);
mBuffer = nullptr;
}
-
- JNIEnv *env = AndroidRuntime::getJNIEnv();
-
- env->DeleteWeakGlobalRef(mObject);
- mObject = NULL;
-
- env->DeleteGlobalRef(mClass);
- mClass = NULL;
}
void JHwBlob::setTo(const void *ptr, size_t handle) {
diff --git a/core/jni/android_os_HwBlob.h b/core/jni/android_os_HwBlob.h
index 0920488..39393cb 100644
--- a/core/jni/android_os_HwBlob.h
+++ b/core/jni/android_os_HwBlob.h
@@ -70,9 +70,6 @@
sp<JHwBlob> mBlob;
};
- jclass mClass;
- jobject mObject;
-
void *mBuffer;
size_t mSize;
bool mOwnsBuffer;
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
index b412b6a..9494fb8 100644
--- a/core/jni/android_os_HwParcel.cpp
+++ b/core/jni/android_os_HwParcel.cpp
@@ -166,10 +166,6 @@
mOwnsParcel(false),
mTransactCallback(nullptr),
mWasSent(false) {
- jclass clazz = env->GetObjectClass(thiz);
- CHECK(clazz != NULL);
-
- mObject = env->NewWeakGlobalRef(thiz);
}
JHwParcel::~JHwParcel() {
@@ -178,9 +174,6 @@
mStorage.release(env);
setParcel(NULL, false /* assumeOwnership */);
-
- env->DeleteWeakGlobalRef(mObject);
- mObject = NULL;
}
hardware::Parcel *JHwParcel::getParcel() {
diff --git a/core/jni/android_os_HwParcel.h b/core/jni/android_os_HwParcel.h
index f6e6100..2c26993 100644
--- a/core/jni/android_os_HwParcel.h
+++ b/core/jni/android_os_HwParcel.h
@@ -53,8 +53,6 @@
virtual ~JHwParcel();
private:
- jobject mObject;
-
hardware::Parcel *mParcel;
bool mOwnsParcel;