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

Commit cea6624f authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Add HwParcel::releaseParcel()" 

am: 210b9afe

Change-Id: If08cb12187e9694144d5c07d9f6fcd67142b8af9
parents 959628a3 210b9afe

core/java/android/os/HwParcel.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -219,6 +219,7 @@ public class HwParcel { 
    public native final void writeStatus(int status);

    public native final void writeStatus(int status);

    public native final void verifySuccess();

    public native final void verifySuccess();

    public native final void releaseTemporaryStorage();

    public native final void releaseTemporaryStorage();

    public native final void release();





    public native final void send();

    public native final void send();

core/jni/android_os_HwParcel.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -404,6 +404,11 @@ static void JHwParcel_native_verifySuccess(JNIEnv *env, jobject thiz) { 
    signalExceptionForError(env, err);

    signalExceptionForError(env, err);

}

}





static void JHwParcel_native_release(

        JNIEnv *env, jobject thiz) {

    JHwParcel::GetNativeContext(env, thiz)->setParcel(NULL, false /* assumeOwnership */);

}



static void JHwParcel_native_releaseTemporaryStorage(

static void JHwParcel_native_releaseTemporaryStorage(

        JNIEnv *env, jobject thiz) {

        JNIEnv *env, jobject thiz) {

    JHwParcel::GetNativeContext(env, thiz)->getStorage()->release(env);

    JHwParcel::GetNativeContext(env, thiz)->getStorage()->release(env);
@@ -955,6 +960,10 @@ static JNINativeMethod gMethods[] = { 




    { "writeBuffer", "(L" PACKAGE_PATH "/HwBlob;)V",

    { "writeBuffer", "(L" PACKAGE_PATH "/HwBlob;)V",

        (void *)JHwParcel_native_writeBuffer },

        (void *)JHwParcel_native_writeBuffer },



    { "release", "()V",

        (void *)JHwParcel_native_release },



};

};





namespace android {

namespace android {