Merge "Remove tracing for notifyContentCapture" into sc-dev (789fe389) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −15

Original line number	Diff line number	Diff line
		@@ -9808,23 +9808,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		private void notifyAppearedOrDisappearedForContentCaptureIfNeeded(boolean appeared) {
		AttachInfo ai = mAttachInfo;
		// Skip it while the view is being laided out for the first time
		// Skip it while the view is being laid out for the first time
		if (ai != null && !ai.mReadyForContentCaptureUpdates) return;

		if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW,
		"notifyContentCapture(" + appeared + ") for " + getClass().getSimpleName());
		}
		try {
		notifyAppearedOrDisappearedForContentCaptureIfNeededNoTrace(appeared);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}

		private void notifyAppearedOrDisappearedForContentCaptureIfNeededNoTrace(boolean appeared) {
		AttachInfo ai = mAttachInfo;

		// First check if context has client, so it saves a service lookup when it doesn't
		if (mContext.getContentCaptureOptions() == null) return;