diff options
| author | 2016-11-14 15:03:31 +0000 | |
|---|---|---|
| committer | 2016-11-14 15:03:32 +0000 | |
| commit | e17e68f13947db4c35ed38d96d792ef18a1946c6 (patch) | |
| tree | a5e46192279a277cab93423a861d4a48b82af288 | |
| parent | 82c9ba9c55c20b6e26a49c15c5f08f0c66e27d9b (diff) | |
| parent | ab2fca253b7dc04daf336b4b589bd096b66c4572 (diff) | |
Merge "hidl: Update for IFoo::descriptor -> const char *."
| -rw-r--r-- | core/jni/android_os_HwParcel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp index 886c0e6771f4..f909580b455e 100644 --- a/core/jni/android_os_HwParcel.cpp +++ b/core/jni/android_os_HwParcel.cpp @@ -267,9 +267,9 @@ static void JHwParcel_native_writeInterfaceToken( const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL); if (interfaceName) { - String16 nameCopy( + String8 nameCopy = String8(String16( reinterpret_cast<const char16_t *>(interfaceName), - env->GetStringLength(interfaceNameObj)); + env->GetStringLength(interfaceNameObj))); env->ReleaseStringCritical(interfaceNameObj, interfaceName); interfaceName = NULL; @@ -277,7 +277,7 @@ static void JHwParcel_native_writeInterfaceToken( hardware::Parcel *parcel = JHwParcel::GetNativeContext(env, thiz)->getParcel(); - status_t err = parcel->writeInterfaceToken(nameCopy); + status_t err = parcel->writeInterfaceToken(nameCopy.string()); signalExceptionForError(env, err); } } @@ -294,9 +294,9 @@ static void JHwParcel_native_enforceInterface( const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL); if (interfaceName) { - String16 interfaceNameCopy( + String8 interfaceNameCopy = String8(String16( reinterpret_cast<const char16_t *>(interfaceName), - env->GetStringLength(interfaceNameObj)); + env->GetStringLength(interfaceNameObj))); env->ReleaseStringCritical(interfaceNameObj, interfaceName); interfaceName = NULL; @@ -304,7 +304,7 @@ static void JHwParcel_native_enforceInterface( hardware::Parcel *parcel = JHwParcel::GetNativeContext(env, thiz)->getParcel(); - bool valid = parcel->enforceInterface(interfaceNameCopy); + bool valid = parcel->enforceInterface(interfaceNameCopy.string()); if (!valid) { jniThrowException( |