Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63887bc7 authored by Andreas Huber's avatar Andreas Huber Committed by android-build-merger
Browse files

Merge "Remove unused global references in JNI code supporting HwBinder." am: 2c4dfa04 

am: 013bea3d

Change-Id: Ic4bc005e8ebf19a4e0389569e7c6cf66a565636b
parents 34639cbb 013bea3d

core/jni/android_os_HwBlob.cpp

+0 −14
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ JHwBlob::JHwBlob(JNIEnv *env, jobject thiz, size_t size) 
      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 @@ JHwBlob::~JHwBlob() { 
        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) {

core/jni/android_os_HwBlob.h

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ private: 
        sp<JHwBlob> mBlob;

    };



    jclass mClass;

    jobject mObject;



    void *mBuffer;

    size_t mSize;

    bool mOwnsBuffer;

core/jni/android_os_HwParcel.cpp

+0 −7
Original line number Diff line number Diff line
@@ -166,10 +166,6 @@ JHwParcel::JHwParcel(JNIEnv *env, jobject thiz) 
      mOwnsParcel(false),

      mTransactCallback(nullptr),

      mWasSent(false) {

    jclass clazz = env->GetObjectClass(thiz);

    CHECK(clazz != NULL);



    mObject = env->NewWeakGlobalRef(thiz);

}



JHwParcel::~JHwParcel() {
@@ -178,9 +174,6 @@ JHwParcel::~JHwParcel() { 
    mStorage.release(env);



    setParcel(NULL, false /* assumeOwnership */);



    env->DeleteWeakGlobalRef(mObject);

    mObject = NULL;

}



hardware::Parcel *JHwParcel::getParcel() {

core/jni/android_os_HwParcel.h

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ protected: 
    virtual ~JHwParcel();



private:

    jobject mObject;



    hardware::Parcel *mParcel;

    bool mOwnsParcel;