commit 88c21d596a00f2c17c811a43c010dfe3ad843026
author Andreas Huber <andih@google.com> Fri Sep 09 15:56:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 09 15:56:30 2016 +0000
tree eb080e16f299fe49e49fa63f382cbac270e1bdb4
parent 24bd141ce05671a5c5fc338633aa6d4fa30a0052
parent 077678590f5e5569fb1bfc1514a7ee5b28996e3e

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

Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163

core/jni/android_os_HwBinder.cpp

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 97833a0..7da0314 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -213,7 +213,9 @@
     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 @@
 
     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);