Merge "DO NOT MERGE: Verify KeyEvents in IME" into tm-qpr-dev (3f30e0f1) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

+37 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,9 +19,11 @@ package android.inputmethodservice;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.content.Context;		import android.content.Context;
	import android.graphics.Rect;		import android.graphics.Rect;
			import android.hardware.input.InputManager;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
			import android.os.SystemClock;
	import android.util.Log;		import android.util.Log;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.view.InputChannel;		import android.view.InputChannel;
	@@ -41,6 +43,8 @@ import com.android.internal.os.SomeArgs;
	import com.android.internal.view.IInputContext;		import com.android.internal.view.IInputContext;
	import com.android.internal.view.IInputMethodSession;		import com.android.internal.view.IInputMethodSession;

			import java.util.Objects;

	class IInputMethodSessionWrapper extends IInputMethodSession.Stub		class IInputMethodSessionWrapper extends IInputMethodSession.Stub
	implements HandlerCaller.Callback {		implements HandlerCaller.Callback {
	private static final String TAG = "InputMethodWrapper";		private static final String TAG = "InputMethodWrapper";
	@@ -56,6 +60,7 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
	private static final int DO_REMOVE_IME_SURFACE = 130;		private static final int DO_REMOVE_IME_SURFACE = 130;
	private static final int DO_FINISH_INPUT = 140;		private static final int DO_FINISH_INPUT = 140;
	private static final int DO_INVALIDATE_INPUT = 150;		private static final int DO_INVALIDATE_INPUT = 150;
			private final Context mContext;


	@UnsupportedAppUsage		@UnsupportedAppUsage
	@@ -66,6 +71,7 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub

	public IInputMethodSessionWrapper(Context context,		public IInputMethodSessionWrapper(Context context,
	InputMethodSession inputMethodSession, InputChannel channel) {		InputMethodSession inputMethodSession, InputChannel channel) {
			mContext = context;
	mCaller = new HandlerCaller(context, null,		mCaller = new HandlerCaller(context, null,
	this, true /asyncHandler/);		this, true /asyncHandler/);
	mInputMethodSession = inputMethodSession;		mInputMethodSession = inputMethodSession;
	@@ -232,6 +238,8 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
	}		}
	private final class ImeInputEventReceiver extends InputEventReceiver		private final class ImeInputEventReceiver extends InputEventReceiver
	implements InputMethodSession.EventCallback {		implements InputMethodSession.EventCallback {
			// Time after which a KeyEvent is invalid
			private static final long KEY_EVENT_ALLOW_PERIOD_MS = 100L;
	private final SparseArray<InputEvent> mPendingEvents = new SparseArray<InputEvent>();		private final SparseArray<InputEvent> mPendingEvents = new SparseArray<InputEvent>();

	public ImeInputEventReceiver(InputChannel inputChannel, Looper looper) {		public ImeInputEventReceiver(InputChannel inputChannel, Looper looper) {
	@@ -246,10 +254,27 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
	return;		return;
	}		}

			KeyEvent keyEvent = null;
			if (event != null && event instanceof KeyEvent) {
			keyEvent = (KeyEvent) event;
			if (hasKeyModifiers(keyEvent)) {
			// any KeyEvent with modifiers (e.g. Ctrl/Alt/Fn) must be verified that
			// they originated from system.
			InputManager im = mContext.getSystemService(InputManager.class);
			Objects.requireNonNull(im);
			final long age = SystemClock.uptimeMillis() - keyEvent.getEventTime();
			if (age >= KEY_EVENT_ALLOW_PERIOD_MS \|\| im.verifyInputEvent(keyEvent) == null) {
			Log.w(TAG, "Unverified or Invalid KeyEvent injected into IME. Dropping "
			+ keyEvent);
			finishInputEvent(event, false /* handled */);
			return;
			}
			}
			}

	final int seq = event.getSequenceNumber();		final int seq = event.getSequenceNumber();
	mPendingEvents.put(seq, event);		mPendingEvents.put(seq, event);
	if (event instanceof KeyEvent) {		if (keyEvent != null) {
	KeyEvent keyEvent = (KeyEvent)event;
	mInputMethodSession.dispatchKeyEvent(seq, keyEvent, this);		mInputMethodSession.dispatchKeyEvent(seq, keyEvent, this);
	} else {		} else {
	MotionEvent motionEvent = (MotionEvent)event;		MotionEvent motionEvent = (MotionEvent)event;
	@@ -270,5 +295,15 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
	finishInputEvent(event, handled);		finishInputEvent(event, handled);
	}		}
	}		}

			private boolean hasKeyModifiers(KeyEvent event) {
			if (event.hasNoModifiers()) {
			return false;
			}
			return event.isCtrlPressed()
			\|\| event.isAltPressed()
			\|\| event.isFunctionPressed()
			\|\| event.isMetaPressed();
			}
	}		}
	}		}