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

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

Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated." 

am: 07767859

Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163
parents 24bd141c 07767859

core/jni/android_os_HwBinder.cpp

+8 −3
Original line number Diff line number Diff line
@@ -213,7 +213,9 @@ static void JHwBinder_native_registerService( 
    sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);



    status_t err = hardware::defaultServiceManager()->addService(

                String16(reinterpret_cast<const char16_t *>(serviceName)),

                String16(

                    reinterpret_cast<const char16_t *>(serviceName),

                    env->GetStringLength(serviceNameObj)),

                binder,

                kVersion);
@@ -245,12 +247,15 @@ static jobject JHwBinder_native_getService( 


    LOG(INFO) << "looking for service '"

              << String8(String16(

                          reinterpret_cast<const char16_t *>(serviceName))).string()

                          reinterpret_cast<const char16_t *>(serviceName),

                          env->GetStringLength(serviceNameObj))).string()

              << "'";



    sp<hardware::IBinder> service =

        hardware::defaultServiceManager()->getService(

                String16(reinterpret_cast<const char16_t *>(serviceName)),

                String16(

                    reinterpret_cast<const char16_t *>(serviceName),

                    env->GetStringLength(serviceNameObj)),

                kVersion);



    env->ReleaseStringCritical(serviceNameObj, serviceName);