am 0c437fd3: Merge "Add appropriate casts for char16_t." (d8c169fe) · Commits · e / os / android_frameworks_base

cmds/idmap/scan.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ namespace {
		size_t len;
		String16 key(parser.getAttributeName(i, &len));
		if (key == String16("targetPackage")) {
		const uint16_t *p = parser.getAttributeStringValue(i, &len);
		const char16_t *p = parser.getAttributeStringValue(i, &len);
		if (p != NULL) {
		target = String16(p, len);
		}

core/jni/android_hardware_Camera.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -474,10 +474,12 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz,
		jobject weak_this, jint cameraId, jint halVersion, jstring clientPackageName)
		{
		// Convert jstring to String16
		const char16_t *rawClientName = env->GetStringChars(clientPackageName, NULL);
		const char16_t rawClientName = reinterpret_cast<const char16_t>(
		env->GetStringChars(clientPackageName, NULL));
		jsize rawClientNameLen = env->GetStringLength(clientPackageName);
		String16 clientName(rawClientName, rawClientNameLen);
		env->ReleaseStringChars(clientPackageName, rawClientName);
		env->ReleaseStringChars(clientPackageName,
		reinterpret_cast<const jchar*>(rawClientName));

		sp<Camera> camera;
		if (halVersion == CAMERA_HAL_API_VERSION_NORMAL_CONNECT) {
		@@ -740,7 +742,8 @@ static void android_hardware_Camera_setParameters(JNIEnv *env, jobject thiz, jst
		const jchar* str = env->GetStringCritical(params, 0);
		String8 params8;
		if (params) {
		params8 = String8(str, env->GetStringLength(params));
		params8 = String8(reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(params));
		env->ReleaseStringCritical(params, str);
		}
		if (camera->setParameters(params8) != NO_ERROR) {

core/jni/android_media_AudioSystem.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -255,7 +255,9 @@ android_media_AudioSystem_setParameters(JNIEnv *env, jobject thiz, jstring keyVa
		const jchar* c_keyValuePairs = env->GetStringCritical(keyValuePairs, 0);
		String8 c_keyValuePairs8;
		if (keyValuePairs) {
		c_keyValuePairs8 = String8(c_keyValuePairs, env->GetStringLength(keyValuePairs));
		c_keyValuePairs8 = String8(
		reinterpret_cast<const char16_t*>(c_keyValuePairs),
		env->GetStringLength(keyValuePairs));
		env->ReleaseStringCritical(keyValuePairs, c_keyValuePairs);
		}
		int status = check_AudioSystem_Command(AudioSystem::setParameters(c_keyValuePairs8));
		@@ -268,7 +270,8 @@ android_media_AudioSystem_getParameters(JNIEnv *env, jobject thiz, jstring keys)
		const jchar* c_keys = env->GetStringCritical(keys, 0);
		String8 c_keys8;
		if (keys) {
		c_keys8 = String8(c_keys, env->GetStringLength(keys));
		c_keys8 = String8(reinterpret_cast<const char16_t*>(c_keys),
		env->GetStringLength(keys));
		env->ReleaseStringCritical(keys, c_keys);
		}
		return env->NewStringUTF(AudioSystem::getParameters(c_keys8).string());

core/jni/android_os_Debug.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -896,7 +896,8 @@ static void android_os_Debug_dumpNativeBacktraceToFile(JNIEnv* env, jobject claz
		const jchar* str = env->GetStringCritical(fileName, 0);
		String8 fileName8;
		if (str) {
		fileName8 = String8(str, env->GetStringLength(fileName));
		fileName8 = String8(reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(fileName));
		env->ReleaseStringCritical(fileName, str);
		}

core/jni/android_os_Parcel.cpp

+11 −5

Original line number	Diff line number	Diff line
		@@ -277,7 +277,9 @@ static void android_os_Parcel_writeString(JNIEnv* env, jclass clazz, jlong nativ
		if (val) {
		const jchar* str = env->GetStringCritical(val, 0);
		if (str) {
		err = parcel->writeString16(str, env->GetStringLength(val));
		err = parcel->writeString16(
		reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(val));
		env->ReleaseStringCritical(val, str);
		}
		} else {
		@@ -411,7 +413,7 @@ static jstring android_os_Parcel_readString(JNIEnv* env, jclass clazz, jlong nat
		size_t len;
		const char16_t* str = parcel->readString16Inplace(&len);
		if (str) {
		return env->NewString(str, len);
		return env->NewString(reinterpret_cast<const jchar*>(str), len);
		}
		return NULL;
		}
		@@ -453,7 +455,8 @@ static jobject android_os_Parcel_openFileDescriptor(JNIEnv* env, jclass clazz,
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		return NULL;
		}
		String8 name8(str, env->GetStringLength(name));
		String8 name8(reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(name));
		env->ReleaseStringCritical(name, str);
		int flags=0;
		switch (mode&0x30000000) {
		@@ -648,7 +651,9 @@ static void android_os_Parcel_writeInterfaceToken(JNIEnv* env, jclass clazz, jlo
		// the caller expects to be invoking
		const jchar* str = env->GetStringCritical(name, 0);
		if (str != NULL) {
		parcel->writeInterfaceToken(String16(str, env->GetStringLength(name)));
		parcel->writeInterfaceToken(String16(
		reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(name)));
		env->ReleaseStringCritical(name, str);
		}
		}
		@@ -663,7 +668,8 @@ static void android_os_Parcel_enforceInterface(JNIEnv* env, jclass clazz, jlong
		IPCThreadState* threadState = IPCThreadState::self();
		const int32_t oldPolicy = threadState->getStrictModePolicy();
		const bool isValid = parcel->enforceInterface(
		String16(str, env->GetStringLength(name)),
		String16(reinterpret_cast<const char16_t*>(str),
		env->GetStringLength(name)),
		threadState);
		env->ReleaseStringCritical(name, str);
		if (isValid) {