Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 077678590f

Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163
This commit is contained in:
Andreas Huber
2016-09-09 15:56:30 +00:00
committed by android-build-merger
parent 24bd141ce0 077678590f
commit 88c21d596a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android_os_HwBinder.cpp
View File

@@ -213,7 +213,9 @@ static void JHwBinder_native_registerService(
sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz); sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);
status_t err = hardware::defaultServiceManager()->addService( status_t err = hardware::defaultServiceManager()->addService(
String16(reinterpret_cast<const char16_t *>(serviceName)), String16(
reinterpret_cast<const char16_t *>(serviceName),
env->GetStringLength(serviceNameObj)),
binder, binder,
kVersion); kVersion);
@@ -245,12 +247,15 @@ static jobject JHwBinder_native_getService(
LOG(INFO) << "looking for service '" LOG(INFO) << "looking for service '"
<< String8(String16( << String8(String16(
reinterpret_cast<const char16_t *>(serviceName))).string() reinterpret_cast<const char16_t *>(serviceName),
env->GetStringLength(serviceNameObj))).string()
<< "'"; << "'";
sp<hardware::IBinder> service = sp<hardware::IBinder> service =
hardware::defaultServiceManager()->getService( hardware::defaultServiceManager()->getService(
String16(reinterpret_cast<const char16_t *>(serviceName)), String16(
reinterpret_cast<const char16_t *>(serviceName),
env->GetStringLength(serviceNameObj)),
kVersion); kVersion);
env->ReleaseStringCritical(serviceNameObj, serviceName); env->ReleaseStringCritical(serviceNameObj, serviceName);