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

Commit 5f9ac420 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "hidl: Update for IFoo::descriptor -> const char *." 

am: e17e68f1

Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
parents e3b71cd5 e17e68f1

core/jni/android_os_HwParcel.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -267,9 +267,9 @@ static void JHwParcel_native_writeInterfaceToken( 




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

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

    if (interfaceName) {

    if (interfaceName) {

        String16 nameCopy(

        String8 nameCopy = String8(String16(

                reinterpret_cast<const char16_t *>(interfaceName),

                reinterpret_cast<const char16_t *>(interfaceName),

                env->GetStringLength(interfaceNameObj));

                env->GetStringLength(interfaceNameObj)));





        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;

        interfaceName = NULL;
@@ -277,7 +277,7 @@ static void JHwParcel_native_writeInterfaceToken( 
        hardware::Parcel *parcel =

        hardware::Parcel *parcel =

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

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





        status_t err = parcel->writeInterfaceToken(nameCopy);

        status_t err = parcel->writeInterfaceToken(nameCopy.string());

        signalExceptionForError(env, err);

        signalExceptionForError(env, err);

    }

    }

}

}
@@ -294,9 +294,9 @@ static void JHwParcel_native_enforceInterface( 




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

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

    if (interfaceName) {

    if (interfaceName) {

        String16 interfaceNameCopy(

        String8 interfaceNameCopy = String8(String16(

                reinterpret_cast<const char16_t *>(interfaceName),

                reinterpret_cast<const char16_t *>(interfaceName),

                env->GetStringLength(interfaceNameObj));

                env->GetStringLength(interfaceNameObj)));





        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        env->ReleaseStringCritical(interfaceNameObj, interfaceName);

        interfaceName = NULL;

        interfaceName = NULL;
@@ -304,7 +304,7 @@ static void JHwParcel_native_enforceInterface( 
        hardware::Parcel *parcel =

        hardware::Parcel *parcel =

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

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





        bool valid = parcel->enforceInterface(interfaceNameCopy);

        bool valid = parcel->enforceInterface(interfaceNameCopy.string());





        if (!valid) {

        if (!valid) {

            jniThrowException(

            jniThrowException(