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

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

Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical... 

Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9 am: fbb980e5 am: fdaf3487
am: 90efd7bb

Change-Id: I66c2b632511ad5b6d2ce971ef4640e6c95c7c7b7
parents 34e1c6a0 90efd7bb

core/jni/android_os_HwParcel.cpp

+15 −14
Original line number Diff line number Diff line
@@ -267,17 +267,17 @@ static void JHwParcel_native_writeInterfaceToken( 


    const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL);

    if (interfaceName) {

        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        status_t err = parcel->writeInterfaceToken(

                String16(

        String16 nameCopy(

                reinterpret_cast<const char16_t *>(interfaceName),

                    env->GetStringLength(interfaceNameObj)));

                env->GetStringLength(interfaceNameObj));



        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;



        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        status_t err = parcel->writeInterfaceToken(nameCopy);

        signalExceptionForError(env, err);

    }

}
@@ -294,17 +294,18 @@ static void JHwParcel_native_enforceInterface( 


    const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL);

    if (interfaceName) {

        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        bool valid = parcel->enforceInterface(

                String16(

        String16 interfaceNameCopy(

                reinterpret_cast<const char16_t *>(interfaceName),

                    env->GetStringLength(interfaceNameObj)));

                env->GetStringLength(interfaceNameObj));



        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;



        hardware::Parcel *parcel =

            JHwParcel::GetNativeContext(env, thiz)->getParcel();



        bool valid = parcel->enforceInterface(interfaceNameCopy);



        if (!valid) {

            jniThrowException(

                    env,