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

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

Merge "Add HwParcel::releaseParcel()" am: 210b9afe am: cea6624f 

am: 388af9c9

Change-Id: Idadca897d444807dbb037eee33d8485717ceaae3
parents 07303288 388af9c9

core/java/android/os/HwParcel.java

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

    public native final void verifySuccess();

    public native final void releaseTemporaryStorage();

    public native final void release();



    public native final void send();

core/jni/android_os_HwParcel.cpp

+9 −0
Original line number Diff line number Diff line
@@ -404,6 +404,11 @@ static void JHwParcel_native_verifySuccess(JNIEnv *env, jobject thiz) { 
    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(

        JNIEnv *env, jobject thiz) {

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


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

        (void *)JHwParcel_native_writeBuffer },



    { "release", "()V",

        (void *)JHwParcel_native_release },



};



namespace android {