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

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

Browse Source 
am: 5f9ac42029

Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db
This commit is contained in:
Steven Moreland
2016-11-14 15:22:35 +00:00
committed by android-build-merger
parent d81df46e80 5f9ac42029
commit cd0f045eb7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_os_HwParcel.cpp
View File

@@ -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(