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

am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

Browse Source 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
This commit is contained in:
Dan Albert
2014-11-20 23:00:56 +00:00
committed by Android Git Automerger
parent c51fdd1bbf d8c169fedf
commit 582bdf9a59
14 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/idmap/scan.cpp
View File

@@ -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);
}

9
core/jni/android_hardware_Camera.cpp
View File

@@ -516,10 +516,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) {
@@ -782,7 +784,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) {

7
core/jni/android_media_AudioSystem.cpp
View File

@@ -260,7 +260,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));
@@ -273,7 +275,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());

3
core/jni/android_os_Debug.cpp
View File

@@ -916,7 +916,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);
}

16
core/jni/android_os_Parcel.cpp
View File

@@ -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) {

30
core/jni/android_util_AssetManager.cpp
View File

@@ -653,23 +653,29 @@ static jint android_content_AssetManager_getResourceIdentifier(JNIEnv* env, jobj
return 0;
}
const char16_t* defType16 = defType
? env->GetStringChars(defType, NULL) : NULL;
const char16_t* defType16 = reinterpret_cast<const char16_t*>(defType)
? reinterpret_cast<const char16_t*>(env->GetStringChars(defType, NULL))
: NULL;
jsize defTypeLen = defType
? env->GetStringLength(defType) : 0;
const char16_t* defPackage16 = defPackage
? env->GetStringChars(defPackage, NULL) : NULL;
const char16_t* defPackage16 = reinterpret_cast<const char16_t*>(defPackage)
? reinterpret_cast<const char16_t*>(env->GetStringChars(defPackage,
NULL))
: NULL;
jsize defPackageLen = defPackage
? env->GetStringLength(defPackage) : 0;
jint ident = am->getResources().identifierForName(
name16.get(), name16.size(), defType16, defTypeLen, defPackage16, defPackageLen);
reinterpret_cast<const char16_t*>(name16.get()), name16.size(),
defType16, defTypeLen, defPackage16, defPackageLen);
if (defPackage16) {
env->ReleaseStringChars(defPackage, defPackage16);
env->ReleaseStringChars(defPackage,
reinterpret_cast<const jchar*>(defPackage16));
}
if (defType16) {
env->ReleaseStringChars(defType, defType16);
env->ReleaseStringChars(defType,
reinterpret_cast<const jchar*>(defType16));
}
return ident;
@@ -929,8 +935,11 @@ static jobject android_content_AssetManager_getAssignedPackageIdentifiers(JNIEnv
const size_t N = res.getBasePackageCount();
for (size_t i = 0; i < N; i++) {
const String16 name = res.getBasePackageName(i);
env->CallVoidMethod(sparseArray, gSparseArrayOffsets.put, (jint) res.getBasePackageId(i),
env->NewString(name, name.size()));
env->CallVoidMethod(
sparseArray, gSparseArrayOffsets.put,
static_cast<jint>(res.getBasePackageId(i)),
env->NewString(reinterpret_cast<const jchar*>(name.string()),
name.size()));
}
return sparseArray;
}
@@ -1869,7 +1878,8 @@ static jobjectArray android_content_AssetManager_getArrayStringResource(JNIEnv*
str = env->NewStringUTF(str8);
} else {
const char16_t* str16 = pool->stringAt(value.data, &strLen);
str = env->NewString(str16, strLen);
str = env->NewString(reinterpret_cast<const jchar*>(str16),
strLen);
}
// If one of our NewString{UTF} calls failed due to memory, an

3
core/jni/android_util_Binder.cpp
View File

@@ -935,7 +935,8 @@ static jstring android_os_BinderProxy_getInterfaceDescriptor(JNIEnv* env, jobjec
IBinder* target = (IBinder*) env->GetLongField(obj, gBinderProxyOffsets.mObject);
if (target != NULL) {
const String16& desc = target->getInterfaceDescriptor();
return env->NewString(desc.string(), desc.size());
return env->NewString(reinterpret_cast<const jchar*>(desc.string()),
desc.size());
}
jniThrowException(env, "java/lang/RuntimeException",
"No binder found for object");

9
core/jni/android_util_Process.cpp
View File

@@ -109,7 +109,8 @@ jint android_os_Process_getUidForName(JNIEnv* env, jobject clazz, jstring name)
const jchar* str16 = env->GetStringCritical(name, 0);
String8 name8;
if (str16) {
name8 = String8(str16, env->GetStringLength(name));
name8 = String8(reinterpret_cast<const char16_t*>(str16),
env->GetStringLength(name));
env->ReleaseStringCritical(name, str16);
}
@@ -140,7 +141,8 @@ jint android_os_Process_getGidForName(JNIEnv* env, jobject clazz, jstring name)
const jchar* str16 = env->GetStringCritical(name, 0);
String8 name8;
if (str16) {
name8 = String8(str16, env->GetStringLength(name));
name8 = String8(reinterpret_cast<const char16_t*>(str16),
env->GetStringLength(name));
env->ReleaseStringCritical(name, str16);
}
@@ -385,7 +387,8 @@ void android_os_Process_setArgV0(JNIEnv* env, jobject clazz, jstring name)
const jchar* str = env->GetStringCritical(name, 0);
String8 name8;
if (str) {
name8 = String8(str, env->GetStringLength(name));
name8 = String8(reinterpret_cast<const char16_t*>(str),
env->GetStringLength(name));
env->ReleaseStringCritical(name, str);
}

9
core/jni/android_util_XmlBlock.cpp
View File

@@ -267,19 +267,20 @@ static jint android_content_XmlBlock_nativeGetAttributeIndex(JNIEnv* env, jobjec
const char16_t* ns16 = NULL;
jsize nsLen = 0;
if (ns) {
ns16 = env->GetStringChars(ns, NULL);
ns16 = reinterpret_cast<const char16_t*>(env->GetStringChars(ns, NULL));
nsLen = env->GetStringLength(ns);
}
const char16_t* name16 = env->GetStringChars(name, NULL);
const char16_t* name16 = reinterpret_cast<const char16_t*>(
env->GetStringChars(name, NULL));
jsize nameLen = env->GetStringLength(name);
jint idx = static_cast<jint>(st->indexOfAttribute(ns16, nsLen, name16, nameLen));
if (ns) {
env->ReleaseStringChars(ns, ns16);
env->ReleaseStringChars(ns, reinterpret_cast<const jchar*>(ns16));
}
env->ReleaseStringChars(name, name16);
env->ReleaseStringChars(name, reinterpret_cast<const jchar*>(name16));
return idx;
}

8
core/jni/android_view_KeyCharacterMap.cpp
View File

@@ -150,7 +150,9 @@ static jchar nativeGetMatch(JNIEnv *env, jobject clazz, jlong ptr, jint keyCode,
return 0;
}
char16_t result = map->getMap()->getMatch(keyCode, chars, size_t(numChars), metaState);
char16_t result = map->getMap()->getMatch(
keyCode, reinterpret_cast<char16_t*>(chars), size_t(numChars),
metaState);
env->ReleasePrimitiveArrayCritical(charsArray, chars, JNI_ABORT);
return result;
@@ -178,7 +180,9 @@ static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jlong ptr,
Vector<KeyEvent> events;
jobjectArray result = NULL;
if (map->getMap()->getEvents(map->getDeviceId(), chars, size_t(numChars), events)) {
if (map->getMap()->getEvents(map->getDeviceId(),
reinterpret_cast<char16_t*>(chars),
size_t(numChars), events)) {
result = env->NewObjectArray(jsize(events.size()), gKeyEventClassInfo.clazz, NULL);
if (result) {
for (size_t i = 0; i < events.size(); i++) {

3
libs/hwui/TextDropShadowCache.cpp
View File

@@ -40,7 +40,8 @@ hash_t ShadowText::hash() const {
hash = JenkinsHashMix(hash, android::hash_type(italicStyle));
hash = JenkinsHashMix(hash, android::hash_type(scaleX));
if (text) {
hash = JenkinsHashMixShorts(hash, text, charCount);
hash = JenkinsHashMixShorts(
hash, reinterpret_cast<const uint16_t*>(text), charCount);
}
if (positions) {
for (uint32_t i = 0; i < charCount * 2; i++) {

8
media/jni/android_media_MediaRecorder.cpp
View File

@@ -462,11 +462,13 @@ android_media_MediaRecorder_native_setup(JNIEnv *env, jobject thiz, jobject weak
sp<JNIMediaRecorderListener> listener = new JNIMediaRecorderListener(env, thiz, weak_this);
mr->setListener(listener);
// Convert client name jstring to String16
const char16_t *rawClientName = env->GetStringChars(packageName, NULL);
// Convert client name jstring to String16
const char16_t *rawClientName = reinterpret_cast<const char16_t*>(
env->GetStringChars(packageName, NULL));
jsize rawClientNameLen = env->GetStringLength(packageName);
String16 clientName(rawClientName, rawClientNameLen);
env->ReleaseStringChars(packageName, rawClientName);
env->ReleaseStringChars(packageName,
reinterpret_cast<const jchar*>(rawClientName));
// pass client package name for permissions tracking
mr->setClientName(clientName);

5
media/jni/android_mtp_MtpDatabase.cpp
View File

@@ -818,7 +818,7 @@ MtpResponseCode MyMtpDatabase::getObjectInfo(MtpObjectHandle handle,
info.mAssociationType = MTP_ASSOCIATION_TYPE_UNDEFINED;
jchar* str = env->GetCharArrayElements(mStringBuffer, 0);
MtpString temp(str);
MtpString temp(reinterpret_cast<char16_t*>(str));
info.mName = strdup((const char *)temp);
env->ReleaseCharArrayElements(mStringBuffer, str, 0);
@@ -887,7 +887,8 @@ MtpResponseCode MyMtpDatabase::getObjectFilePath(MtpObjectHandle handle,
}
jchar* str = env->GetCharArrayElements(mStringBuffer, 0);
outFilePath.setTo(str, strlen16(str));
outFilePath.setTo(reinterpret_cast<char16_t*>(str),
strlen16(reinterpret_cast<char16_t*>(str)));
env->ReleaseCharArrayElements(mStringBuffer, str, 0);
jlong* longValues = env->GetLongArrayElements(mLongBuffer, 0);

5
packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp
View File

@@ -48,7 +48,8 @@ bool pacSet = false;
String16 jstringToString16(JNIEnv* env, jstring jstr) {
const jchar* str = env->GetStringCritical(jstr, 0);
String16 str16(str, env->GetStringLength(jstr));
String16 str16(reinterpret_cast<const char16_t*>(str),
env->GetStringLength(jstr));
env->ReleaseStringCritical(jstr, str);
return str16;
}
@@ -57,7 +58,7 @@ jstring string16ToJstring(JNIEnv* env, String16 string) {
const char16_t* str = string.string();
size_t len = string.size();
return env->NewString(str, len);
return env->NewString(reinterpret_cast<const jchar*>(str), len);
}
static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */,