Merge changes from topics "input_events_sequence_num", "wire_input_event_id" (522d1043) · Commits · e / os / android_frameworks_base

core/java/android/view/InputEvent.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,21 @@ public abstract class InputEvent implements Parcelable {
		return mSeq;
		}

		/**
		* Gets the ID of this event. This is generated when an event is created and preserved until its
		* last stage. It won't change just because the event crosses process boundary, but should
		* change when making a copy with modifications.
		* <p>
		* To avoid exposing app usage to other processes this ID is generated from a CSPRNG. Therefore
		* there isn't 100% guarantee on the uniqueness of this ID, though the chance of ID collisions
		* is considerably low. The rule of thumb is not to rely on the uniqueness for production logic,
		* but a good source for tracking an event (e.g. logging and profiling).
		*
		* @return The ID of this event.
		* @hide
		*/
		public abstract int getId();

		public int describeContents() {
		return 0;
		}

core/java/android/view/KeyEvent.java

+40 −5

Original line number	Diff line number	Diff line
		@@ -1265,6 +1265,7 @@ public class KeyEvent extends InputEvent implements Parcelable {

		private KeyEvent mNext;

		private int mId;
		@UnsupportedAppUsage
		private int mDeviceId;
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		@@ -1350,9 +1351,9 @@ public class KeyEvent extends InputEvent implements Parcelable {

		private static native String nativeKeyCodeToString(int keyCode);
		private static native int nativeKeyCodeFromString(String keyCode);
		private static native int nativeNextId();

		private KeyEvent() {
		}
		private KeyEvent() {}

		/**
		* Create a new key event.
		@@ -1362,6 +1363,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		* @param code The key code.
		*/
		public KeyEvent(int action, int code) {
		mId = nativeNextId();
		mAction = action;
		mKeyCode = code;
		mRepeatCount = 0;
		@@ -1383,6 +1385,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		public KeyEvent(long downTime, long eventTime, int action,
		int code, int repeat) {
		mId = nativeNextId();
		mDownTime = downTime;
		mEventTime = eventTime;
		mAction = action;
		@@ -1407,6 +1410,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		public KeyEvent(long downTime, long eventTime, int action,
		int code, int repeat, int metaState) {
		mId = nativeNextId();
		mDownTime = downTime;
		mEventTime = eventTime;
		mAction = action;
		@@ -1435,6 +1439,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		public KeyEvent(long downTime, long eventTime, int action,
		int code, int repeat, int metaState,
		int deviceId, int scancode) {
		mId = nativeNextId();
		mDownTime = downTime;
		mEventTime = eventTime;
		mAction = action;
		@@ -1465,6 +1470,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		public KeyEvent(long downTime, long eventTime, int action,
		int code, int repeat, int metaState,
		int deviceId, int scancode, int flags) {
		mId = nativeNextId();
		mDownTime = downTime;
		mEventTime = eventTime;
		mAction = action;
		@@ -1497,6 +1503,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		public KeyEvent(long downTime, long eventTime, int action,
		int code, int repeat, int metaState,
		int deviceId, int scancode, int flags, int source) {
		mId = nativeNextId();
		mDownTime = downTime;
		mEventTime = eventTime;
		mAction = action;
		@@ -1523,6 +1530,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		* @param flags The flags for this key event
		*/
		public KeyEvent(long time, String characters, int deviceId, int flags) {
		mId = nativeNextId();
		mDownTime = time;
		mEventTime = time;
		mCharacters = characters;
		@@ -1539,6 +1547,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		* Make an exact copy of an existing key event.
		*/
		public KeyEvent(KeyEvent origEvent) {
		mId = origEvent.mId;
		mDownTime = origEvent.mDownTime;
		mEventTime = origEvent.mEventTime;
		mAction = origEvent.mAction;
		@@ -1567,6 +1576,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		@Deprecated
		public KeyEvent(KeyEvent origEvent, long eventTime, int newRepeat) {
		mId = nativeNextId(); // Not an exact copy so assign a new ID.
		mDownTime = origEvent.mDownTime;
		mEventTime = eventTime;
		mAction = origEvent.mAction;
		@@ -1598,15 +1608,16 @@ public class KeyEvent extends InputEvent implements Parcelable {
		}

		/**
		* Obtains a (potentially recycled) key event.
		* Obtains a (potentially recycled) key event. Used by native code to create a Java object.
		*
		* @hide
		*/
		public static KeyEvent obtain(long downTime, long eventTime, int action,
		public static KeyEvent obtain(int id, long downTime, long eventTime, int action,
		int code, int repeat, int metaState,
		int deviceId, int scancode, int flags, int source, int displayId, @Nullable byte[] hmac,
		String characters) {
		KeyEvent ev = obtain();
		ev.mId = id;
		ev.mDownTime = downTime;
		ev.mEventTime = eventTime;
		ev.mAction = action;
		@@ -1623,6 +1634,18 @@ public class KeyEvent extends InputEvent implements Parcelable {
		return ev;
		}

		/**
		* Obtains a (potentially recycled) key event.
		*
		* @hide
		*/
		public static KeyEvent obtain(long downTime, long eventTime, int action,
		int code, int repeat, int metaState,
		int deviceId, int scanCode, int flags, int source, int displayId, String characters) {
		return obtain(nativeNextId(), downTime, eventTime, action, code, repeat, metaState,
		deviceId, scanCode, flags, source, displayId, null /* hmac */, characters);
		}

		/**
		* Obtains a (potentially recycled) key event.
		*
		@@ -1633,7 +1656,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		int code, int repeat, int metaState,
		int deviceId, int scancode, int flags, int source, String characters) {
		return obtain(downTime, eventTime, action, code, repeat, metaState, deviceId, scancode,
		flags, source, INVALID_DISPLAY, null /* hmac */, characters);
		flags, source, INVALID_DISPLAY, characters);
		}

		/**
		@@ -1645,6 +1668,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		public static KeyEvent obtain(KeyEvent other) {
		KeyEvent ev = obtain();
		ev.mId = other.mId;
		ev.mDownTime = other.mDownTime;
		ev.mEventTime = other.mEventTime;
		ev.mAction = other.mAction;
		@@ -1695,6 +1719,12 @@ public class KeyEvent extends InputEvent implements Parcelable {
		// Do nothing.
		}

		/** @hide */
		@Override
		public int getId() {
		return mId;
		}

		/**
		* Create a new key event that is the same as the given one, but whose
		* event time and repeat count are replaced with the given value.
		@@ -1723,6 +1753,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		public static KeyEvent changeTimeRepeat(KeyEvent event, long eventTime,
		int newRepeat, int newFlags) {
		KeyEvent ret = new KeyEvent(event);
		ret.mId = nativeNextId(); // Not an exact copy so assign a new ID.
		ret.mEventTime = eventTime;
		ret.mRepeatCount = newRepeat;
		ret.mFlags = newFlags;
		@@ -1736,6 +1767,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		* @param action The new action code of the event.
		*/
		private KeyEvent(KeyEvent origEvent, int action) {
		mId = nativeNextId(); // Not an exact copy so assign a new ID.
		mDownTime = origEvent.mDownTime;
		mEventTime = origEvent.mEventTime;
		mAction = action;
		@@ -1772,6 +1804,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		public static KeyEvent changeFlags(KeyEvent event, int flags) {
		event = new KeyEvent(event);
		event.mId = nativeNextId(); // Not an exact copy so assign a new ID.
		event.mFlags = flags;
		return event;
		}
		@@ -3096,6 +3129,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		}

		private KeyEvent(Parcel in) {
		mId = in.readInt();
		mDeviceId = in.readInt();
		mSource = in.readInt();
		mDisplayId = in.readInt();
		@@ -3115,6 +3149,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(PARCEL_TOKEN_KEY_EVENT);

		out.writeInt(mId);
		out.writeInt(mDeviceId);
		out.writeInt(mSource);
		out.writeInt(mDisplayId);

core/java/android/view/MotionEvent.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1550,6 +1550,8 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		private static native long nativeCopy(long destNativePtr, long sourceNativePtr,
		boolean keepHistory);
		@CriticalNative
		private static native int nativeGetId(long nativePtr);
		@CriticalNative
		private static native int nativeGetDeviceId(long nativePtr);
		@CriticalNative
		private static native int nativeGetSource(long nativePtr);
		@@ -2024,6 +2026,12 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		}
		}

		/** @hide */
		@Override
		public int getId() {
		return nativeGetId(mNativePtr);
		}

		/** {@inheritDoc} */
		@Override
		public final int getDeviceId() {

core/java/android/view/ViewRootImpl.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -5379,7 +5379,8 @@ public final class ViewRootImpl implements ViewParent,
		if (mTracePrefix == null) {
		mTracePrefix = getClass().getSimpleName();
		}
		Trace.traceBegin(traceTag, mTracePrefix + " seq#=" + q.mEvent.getSequenceNumber());
		Trace.traceBegin(traceTag, mTracePrefix + " id=0x"
		+ Integer.toHexString(q.mEvent.getId()));
		}
		}

		@@ -7986,12 +7987,13 @@ public final class ViewRootImpl implements ViewParent,

		private void deliverInputEvent(QueuedInputEvent q) {
		Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent",
		q.mEvent.getSequenceNumber());
		q.mEvent.getId());

		if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent src=0x"
		+ Integer.toHexString(q.mEvent.getSource()) + " eventTimeNano="
		+ q.mEvent.getEventTimeNano() + " seq#=" + q.mEvent.getSequenceNumber());
		+ q.mEvent.getEventTimeNano() + " id=0x"
		+ Integer.toHexString(q.mEvent.getId()));
		}
		try {
		if (mInputEventConsistencyVerifier != null) {
		@@ -8032,7 +8034,7 @@ public final class ViewRootImpl implements ViewParent,

		private void finishInputEvent(QueuedInputEvent q) {
		Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW, "deliverInputEvent",
		q.mEvent.getSequenceNumber());
		q.mEvent.getId());

		if (q.mReceiver != null) {
		boolean handled = (q.mFlags & QueuedInputEvent.FLAG_FINISHED_HANDLED) != 0;

core/jni/android_view_InputEventSender.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -114,9 +114,9 @@ status_t NativeInputEventSender::sendKeyEvent(uint32_t seq, const KeyEvent* even

		uint32_t publishedSeq = mNextPublishedSeq++;
		status_t status =
		mInputPublisher.publishKeyEvent(publishedSeq, event->getDeviceId(), event->getSource(),
		event->getDisplayId(), event->getHmac(),
		event->getAction(), event->getFlags(),
		mInputPublisher.publishKeyEvent(publishedSeq, event->getId(), event->getDeviceId(),
		event->getSource(), event->getDisplayId(),
		event->getHmac(), event->getAction(), event->getFlags(),
		event->getKeyCode(), event->getScanCode(),
		event->getMetaState(), event->getRepeatCount(),
		event->getDownTime(), event->getEventTime());
		@@ -138,12 +138,12 @@ status_t NativeInputEventSender::sendMotionEvent(uint32_t seq, const MotionEvent
		for (size_t i = 0; i <= event->getHistorySize(); i++) {
		publishedSeq = mNextPublishedSeq++;
		status_t status =
		mInputPublisher.publishMotionEvent(publishedSeq, event->getDeviceId(),
		event->getSource(), event->getDisplayId(),
		event->getHmac(), event->getAction(),
		event->getActionButton(), event->getFlags(),
		event->getEdgeFlags(), event->getMetaState(),
		event->getButtonState(),
		mInputPublisher.publishMotionEvent(publishedSeq, event->getId(),
		event->getDeviceId(), event->getSource(),
		event->getDisplayId(), event->getHmac(),
		event->getAction(), event->getActionButton(),
		event->getFlags(), event->getEdgeFlags(),
		event->getMetaState(), event->getButtonState(),
		event->getClassification(), event->getXScale(),
		event->getYScale(), event->getXOffset(),
		event->getYOffset(), event->getXPrecision(),