Merge "Add onPointerDownOutsideFocus for events outside the focused window (3/4)" (03dda730) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/input/InputManagerService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1808,6 +1808,10 @@ public class InputManagerService extends IInputManager.Stub
		injectorPid, injectorUid) == PackageManager.PERMISSION_GRANTED;
		}

		// Native callback.
		private void onPointerDownOutsideFocus(IBinder touchedToken) {
		}

		// Native callback.
		private int getVirtualKeyQuietTimeMillis() {
		return mContext.getResources().getInteger(

services/core/jni/com_android_server_input_InputManagerService.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ static struct {
		jmethodID interceptKeyBeforeDispatching;
		jmethodID dispatchUnhandledKey;
		jmethodID checkInjectEventsPermission;
		jmethodID onPointerDownOutsideFocus;
		jmethodID getVirtualKeyQuietTimeMillis;
		jmethodID getExcludedDeviceNames;
		jmethodID getInputPortAssociations;
		@@ -259,6 +260,7 @@ public:
		virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType);
		virtual bool checkInjectEventsPermissionNonReentrant(
		int32_t injectorPid, int32_t injectorUid);
		virtual void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken);

		/* --- PointerControllerPolicyInterface implementation --- */

		@@ -1205,6 +1207,15 @@ bool NativeInputManager::checkInjectEventsPermissionNonReentrant(
		return result;
		}

		void NativeInputManager::onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) {
		ATRACE_CALL();
		JNIEnv* env = jniEnv();

		jobject touchedTokenObj = javaObjectForIBinder(env, touchedToken);
		env->CallVoidMethod(mServiceObj, gServiceClassInfo.onPointerDownOutsideFocus, touchedTokenObj);
		checkAndClearExceptionFromCallback(env, "onPointerDownOutsideFocus");
		}

		void NativeInputManager::loadPointerIcon(SpriteIcon* icon, int32_t displayId) {
		ATRACE_CALL();
		JNIEnv* env = jniEnv();
		@@ -1809,6 +1820,9 @@ int register_android_server_InputManager(JNIEnv* env) {
		GET_METHOD_ID(gServiceClassInfo.checkInjectEventsPermission, clazz,
		"checkInjectEventsPermission", "(II)Z");

		GET_METHOD_ID(gServiceClassInfo.onPointerDownOutsideFocus, clazz,
		"onPointerDownOutsideFocus", "(Landroid/os/IBinder;)V");

		GET_METHOD_ID(gServiceClassInfo.getVirtualKeyQuietTimeMillis, clazz,
		"getVirtualKeyQuietTimeMillis", "()I");