Merge "Merge android.util.imetracing into com.android.internal.inputmethod" (2407ab11) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ import android.text.method.MovementMethod;
		import android.util.Log;
		import android.util.PrintWriterPrinter;
		import android.util.Printer;
		import android.util.imetracing.ImeTracing;
		import android.util.proto.ProtoOutputStream;
		import android.view.Gravity;
		import android.view.KeyCharacterMap;
		@@ -133,6 +132,7 @@ import android.window.WindowMetricsHelper;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.inputmethod.IInputContentUriToken;
		import com.android.internal.inputmethod.IInputMethodPrivilegedOperations;
		import com.android.internal.inputmethod.ImeTracing;
		import com.android.internal.inputmethod.InputMethodPrivilegedOperations;
		import com.android.internal.inputmethod.InputMethodPrivilegedOperationsRegistry;
		import com.android.internal.view.IInlineSuggestionsRequestCallback;

core/java/android/inputmethodservice/RemoteInputConnection.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Bundle;
		import android.os.Handler;
		import android.util.imetracing.ImeTracing;
		import android.util.imetracing.InputConnectionHelper;
		import android.util.proto.ProtoOutputStream;
		import android.view.KeyEvent;
		import android.view.inputmethod.CompletionInfo;
		@@ -39,6 +37,8 @@ import android.view.inputmethod.SurroundingText;
		import com.android.internal.inputmethod.CancellationGroup;
		import com.android.internal.inputmethod.Completable;
		import com.android.internal.inputmethod.IInputContextInvoker;
		import com.android.internal.inputmethod.ImeTracing;
		import com.android.internal.inputmethod.InputConnectionProtoDumper;
		import com.android.internal.view.IInputContext;
		import com.android.internal.view.IInputMethod;

		@@ -93,8 +93,8 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetTextAfterCursorProto(length,
		flags, result);
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetTextAfterCursorProto(
		length, flags, result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getTextAfterCursor",
		inputMethodService, icProto);
		}
		@@ -118,8 +118,8 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetTextBeforeCursorProto(length,
		flags, result);
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetTextBeforeCursorProto(
		length, flags, result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getTextBeforeCursor",
		inputMethodService, icProto);
		}
		@@ -143,7 +143,7 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetSelectedTextProto(flags,
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetSelectedTextProto(flags,
		result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getSelectedText",
		inputMethodService, icProto);
		@@ -182,7 +182,7 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetSurroundingTextProto(
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetSurroundingTextProto(
		beforeLength, afterLength, flags, result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getSurroundingText",
		inputMethodService, icProto);
		@@ -203,7 +203,7 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetCursorCapsModeProto(
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetCursorCapsModeProto(
		reqModes, result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getCursorCapsMode",
		inputMethodService, icProto);
		@@ -224,7 +224,7 @@ final class RemoteInputConnection implements InputConnection {

		final AbstractInputMethodService inputMethodService = mInputMethodService.get();
		if (inputMethodService != null && ImeTracing.getInstance().isEnabled()) {
		ProtoOutputStream icProto = InputConnectionHelper.buildGetExtractedTextProto(
		ProtoOutputStream icProto = InputConnectionProtoDumper.buildGetExtractedTextProto(
		request, flags, result);
		ImeTracing.getInstance().triggerServiceDump(TAG + "#getExtractedText",
		inputMethodService, icProto);

core/java/android/util/imetracing/OWNERS

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		set noparent

		include /services/core/java/com/android/server/inputmethod/OWNERS

core/java/android/view/InsetsController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.util.ArraySet;
		import android.util.Log;
		import android.util.Pair;
		import android.util.SparseArray;
		import android.util.imetracing.ImeTracing;
		import android.util.proto.ProtoOutputStream;
		import android.view.InsetsSourceConsumer.ShowResult;
		import android.view.InsetsState.InternalInsetsType;
		@@ -61,6 +60,7 @@ import android.view.inputmethod.InputMethodManager;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
		import com.android.internal.inputmethod.ImeTracing;

		import java.io.PrintWriter;
		import java.lang.annotation.Retention;

core/java/android/view/InsetsSourceConsumer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@ import android.annotation.Nullable;
		import android.graphics.Insets;
		import android.graphics.Rect;
		import android.util.Log;
		import android.util.imetracing.ImeTracing;
		import android.util.proto.ProtoOutputStream;
		import android.view.InsetsState.InternalInsetsType;
		import android.view.SurfaceControl.Transaction;
		import android.view.WindowInsets.Type.InsetsType;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.inputmethod.ImeTracing;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;