am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers... (425b08f1) · Commits · e / os / android_frameworks_base

core/java/android/view/KeyCharacterMap.java

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -282,20 +282,20 @@ public class KeyCharacterMap implements Parcelable {
	}		}
	};		};

	private int mPtr;		private long mPtr;

	private static native int nativeReadFromParcel(Parcel in);		private static native long nativeReadFromParcel(Parcel in);
	private static native void nativeWriteToParcel(int ptr, Parcel out);		private static native void nativeWriteToParcel(long ptr, Parcel out);
	private static native void nativeDispose(int ptr);		private static native void nativeDispose(long ptr);

	private static native char nativeGetCharacter(int ptr, int keyCode, int metaState);		private static native char nativeGetCharacter(long ptr, int keyCode, int metaState);
	private static native boolean nativeGetFallbackAction(int ptr, int keyCode, int metaState,		private static native boolean nativeGetFallbackAction(long ptr, int keyCode, int metaState,
	FallbackAction outFallbackAction);		FallbackAction outFallbackAction);
	private static native char nativeGetNumber(int ptr, int keyCode);		private static native char nativeGetNumber(long ptr, int keyCode);
	private static native char nativeGetMatch(int ptr, int keyCode, char[] chars, int metaState);		private static native char nativeGetMatch(long ptr, int keyCode, char[] chars, int metaState);
	private static native char nativeGetDisplayLabel(int ptr, int keyCode);		private static native char nativeGetDisplayLabel(long ptr, int keyCode);
	private static native int nativeGetKeyboardType(int ptr);		private static native int nativeGetKeyboardType(long ptr);
	private static native KeyEvent[] nativeGetEvents(int ptr, char[] chars);		private static native KeyEvent[] nativeGetEvents(long ptr, char[] chars);

	private KeyCharacterMap(Parcel in) {		private KeyCharacterMap(Parcel in) {
	if (in == null) {		if (in == null) {
	@@ -308,7 +308,7 @@ public class KeyCharacterMap implements Parcelable {
	}		}

	// Called from native		// Called from native
	private KeyCharacterMap(int ptr) {		private KeyCharacterMap(long ptr) {
	mPtr = ptr;		mPtr = ptr;
	}		}

core/jni/android_view_KeyCharacterMap.cpp

+23 −23

Original line number	Original line	Diff line number	Diff line
	@@ -75,10 +75,10 @@ jobject android_view_KeyCharacterMap_create(JNIEnv* env, int32_t deviceId,
	}		}

	return env->NewObject(gKeyCharacterMapClassInfo.clazz, gKeyCharacterMapClassInfo.ctor,		return env->NewObject(gKeyCharacterMapClassInfo.clazz, gKeyCharacterMapClassInfo.ctor,
	reinterpret_cast<jint>(map));		reinterpret_cast<jlong>(map));
	}		}

	static jint nativeReadFromParcel(JNIEnv *env, jobject clazz, jobject parcelObj) {		static jlong nativeReadFromParcel(JNIEnv *env, jobject clazz, jobject parcelObj) {
	Parcel* parcel = parcelForJavaObject(env, parcelObj);		Parcel* parcel = parcelForJavaObject(env, parcelObj);
	if (!parcel) {		if (!parcel) {
	return 0;		return 0;
	@@ -95,10 +95,10 @@ static jint nativeReadFromParcel(JNIEnv *env, jobject clazz, jobject parcelObj)
	}		}

	NativeKeyCharacterMap* map = new NativeKeyCharacterMap(deviceId, kcm);		NativeKeyCharacterMap* map = new NativeKeyCharacterMap(deviceId, kcm);
	return reinterpret_cast<jint>(map);		return reinterpret_cast<jlong>(map);
	}		}

	static void nativeWriteToParcel(JNIEnv* env, jobject clazz, jint ptr, jobject parcelObj) {		static void nativeWriteToParcel(JNIEnv* env, jobject clazz, jlong ptr, jobject parcelObj) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	Parcel* parcel = parcelForJavaObject(env, parcelObj);		Parcel* parcel = parcelForJavaObject(env, parcelObj);
	if (parcel) {		if (parcel) {
	@@ -107,18 +107,18 @@ static void nativeWriteToParcel(JNIEnv* env, jobject clazz, jint ptr, jobject pa
	}		}
	}		}

	static void nativeDispose(JNIEnv *env, jobject clazz, jint ptr) {		static void nativeDispose(JNIEnv *env, jobject clazz, jlong ptr) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	delete map;		delete map;
	}		}

	static jchar nativeGetCharacter(JNIEnv *env, jobject clazz, jint ptr,		static jchar nativeGetCharacter(JNIEnv *env, jobject clazz, jlong ptr,
	jint keyCode, jint metaState) {		jint keyCode, jint metaState) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	return map->getMap()->getCharacter(keyCode, metaState);		return map->getMap()->getCharacter(keyCode, metaState);
	}		}

	static jboolean nativeGetFallbackAction(JNIEnv *env, jobject clazz, jint ptr, jint keyCode,		static jboolean nativeGetFallbackAction(JNIEnv *env, jobject clazz, jlong ptr, jint keyCode,
	jint metaState, jobject fallbackActionObj) {		jint metaState, jobject fallbackActionObj) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	KeyCharacterMap::FallbackAction fallbackAction;		KeyCharacterMap::FallbackAction fallbackAction;
	@@ -133,12 +133,12 @@ static jboolean nativeGetFallbackAction(JNIEnv *env, jobject clazz, jint ptr, ji
	return result;		return result;
	}		}

	static jchar nativeGetNumber(JNIEnv *env, jobject clazz, jint ptr, jint keyCode) {		static jchar nativeGetNumber(JNIEnv *env, jobject clazz, jlong ptr, jint keyCode) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	return map->getMap()->getNumber(keyCode);		return map->getMap()->getNumber(keyCode);
	}		}

	static jchar nativeGetMatch(JNIEnv *env, jobject clazz, jint ptr, jint keyCode,		static jchar nativeGetMatch(JNIEnv *env, jobject clazz, jlong ptr, jint keyCode,
	jcharArray charsArray, jint metaState) {		jcharArray charsArray, jint metaState) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);

	@@ -154,17 +154,17 @@ static jchar nativeGetMatch(JNIEnv *env, jobject clazz, jint ptr, jint keyCode,
	return result;		return result;
	}		}

	static jchar nativeGetDisplayLabel(JNIEnv *env, jobject clazz, jint ptr, jint keyCode) {		static jchar nativeGetDisplayLabel(JNIEnv *env, jobject clazz, jlong ptr, jint keyCode) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	return map->getMap()->getDisplayLabel(keyCode);		return map->getMap()->getDisplayLabel(keyCode);
	}		}

	static jint nativeGetKeyboardType(JNIEnv *env, jobject clazz, jint ptr) {		static jint nativeGetKeyboardType(JNIEnv *env, jobject clazz, jlong ptr) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);
	return map->getMap()->getKeyboardType();		return map->getMap()->getKeyboardType();
	}		}

	static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jint ptr,		static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jlong ptr,
	jcharArray charsArray) {		jcharArray charsArray) {
	NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);		NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);

	@@ -199,25 +199,25 @@ static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jint ptr,

	static JNINativeMethod g_methods[] = {		static JNINativeMethod g_methods[] = {
	/* name, signature, funcPtr */		/* name, signature, funcPtr */
	{ "nativeReadFromParcel", "(Landroid/os/Parcel;)I",		{ "nativeReadFromParcel", "(Landroid/os/Parcel;)J",
	(void*)nativeReadFromParcel },		(void*)nativeReadFromParcel },
	{ "nativeWriteToParcel", "(ILandroid/os/Parcel;)V",		{ "nativeWriteToParcel", "(JLandroid/os/Parcel;)V",
	(void*)nativeWriteToParcel },		(void*)nativeWriteToParcel },
	{ "nativeDispose", "(I)V",		{ "nativeDispose", "(J)V",
	(void*)nativeDispose },		(void*)nativeDispose },
	{ "nativeGetCharacter", "(III)C",		{ "nativeGetCharacter", "(JII)C",
	(void*)nativeGetCharacter },		(void*)nativeGetCharacter },
	{ "nativeGetFallbackAction", "(IIILandroid/view/KeyCharacterMap$FallbackAction;)Z",		{ "nativeGetFallbackAction", "(JIILandroid/view/KeyCharacterMap$FallbackAction;)Z",
	(void*)nativeGetFallbackAction },		(void*)nativeGetFallbackAction },
	{ "nativeGetNumber", "(II)C",		{ "nativeGetNumber", "(JI)C",
	(void*)nativeGetNumber },		(void*)nativeGetNumber },
	{ "nativeGetMatch", "(II[CI)C",		{ "nativeGetMatch", "(JI[CI)C",
	(void*)nativeGetMatch },		(void*)nativeGetMatch },
	{ "nativeGetDisplayLabel", "(II)C",		{ "nativeGetDisplayLabel", "(JI)C",
	(void*)nativeGetDisplayLabel },		(void*)nativeGetDisplayLabel },
	{ "nativeGetKeyboardType", "(I)I",		{ "nativeGetKeyboardType", "(J)I",
	(void*)nativeGetKeyboardType },		(void*)nativeGetKeyboardType },
	{ "nativeGetEvents", "(I[C)[Landroid/view/KeyEvent;",		{ "nativeGetEvents", "(J[C)[Landroid/view/KeyEvent;",
	(void*)nativeGetEvents },		(void*)nativeGetEvents },
	};		};

	@@ -239,7 +239,7 @@ int register_android_view_KeyCharacterMap(JNIEnv* env)
	gKeyCharacterMapClassInfo.clazz = jclass(env->NewGlobalRef(gKeyCharacterMapClassInfo.clazz));		gKeyCharacterMapClassInfo.clazz = jclass(env->NewGlobalRef(gKeyCharacterMapClassInfo.clazz));

	GET_METHOD_ID(gKeyCharacterMapClassInfo.ctor, gKeyCharacterMapClassInfo.clazz,		GET_METHOD_ID(gKeyCharacterMapClassInfo.ctor, gKeyCharacterMapClassInfo.clazz,
	"<init>", "(I)V");		"<init>", "(J)V");

	FIND_CLASS(gKeyEventClassInfo.clazz, "android/view/KeyEvent");		FIND_CLASS(gKeyEventClassInfo.clazz, "android/view/KeyEvent");
	gKeyEventClassInfo.clazz = jclass(env->NewGlobalRef(gKeyEventClassInfo.clazz));		gKeyEventClassInfo.clazz = jclass(env->NewGlobalRef(gKeyEventClassInfo.clazz));