Merge "Add some synchronous input trace points." (461ad093) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+57 −17

Original line number	Diff line number	Diff line
		@@ -4966,6 +4966,8 @@ public final class ViewRootImpl implements ViewParent,
		protected static final int FINISH_HANDLED = 1;
		protected static final int FINISH_NOT_HANDLED = 2;

		private String mTracePrefix;

		/**
		* Creates an input stage.
		* @param next The next stage to which events should be forwarded.
		@@ -4983,7 +4985,14 @@ public final class ViewRootImpl implements ViewParent,
		} else if (shouldDropInputEvent(q)) {
		finish(q, false);
		} else {
		apply(q, onProcess(q));
		traceEvent(q, Trace.TRACE_TAG_VIEW);
		final int result;
		try {
		result = onProcess(q);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		apply(q, result);
		}
		}

		@@ -5093,6 +5102,17 @@ public final class ViewRootImpl implements ViewParent,
		return false;
		}
		}

		private void traceEvent(QueuedInputEvent q, long traceTag) {
		if (!Trace.isTagEnabled(traceTag)) {
		return;
		}

		if (mTracePrefix == null) {
		mTracePrefix = getClass().getSimpleName();
		}
		Trace.traceBegin(traceTag, mTracePrefix + " seq#=" + q.mEvent.getSequenceNumber());
		}
		}

		/**
		@@ -7709,8 +7729,20 @@ public final class ViewRootImpl implements ViewParent,
		private void deliverInputEvent(QueuedInputEvent q) {
		Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent",
		q.mEvent.getSequenceNumber());

		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());
		}
		try {
		if (mInputEventConsistencyVerifier != null) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "verifyEventConsistency");
		try {
		mInputEventConsistencyVerifier.onInputEvent(q.mEvent, 0);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}

		InputStage stage;
		@@ -7721,7 +7753,12 @@ public final class ViewRootImpl implements ViewParent,
		}

		if (q.mEvent instanceof KeyEvent) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "preDispatchToUnhandledKeyManager");
		try {
		mUnhandledKeyManager.preDispatch((KeyEvent) q.mEvent);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}

		if (stage != null) {
		@@ -7730,6 +7767,9 @@ public final class ViewRootImpl implements ViewParent,
		} else {
		finishInputEvent(q);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}

		private void finishInputEvent(QueuedInputEvent q) {