Merge changes from topics "ime-tracing-interface", "optimized-ime-tracing-clients", "optimized-ime-tracing-imms", "optimized-ime-tracing-ims"

* changes:
  Log only current client data in IME tracing
  Optimized workflow for IME tracing on InputMethodManagerService side
  Optimized workflow for IME tracing on InputMethodService side
  Optimized workflow for IME tracing on clients side

1 files changed, 4 insertions, 5 deletions

diff --git a/core/java/android/inputmethodservice/AbstractInputMethodService.java b/core/java/android/inputmethodservice/AbstractInputMethodService.java
index cd436374b489..7cf0b10031ac 100644
--- a/core/java/android/inputmethodservice/AbstractInputMethodService.java
+++ b/core/java/android/inputmethodservice/AbstractInputMethodService.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
+import android.util.proto.ProtoOutputStream;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.inputmethod.InputConnection;
@@ -195,15 +196,13 @@ public abstract class AbstractInputMethodService extends Service
     public abstract AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();
 
     /**
-     * Dumps the internal state of IME to a protocol buffer output stream initialized using the
-     * given {@link FileDescriptor}.
+     * Dumps the internal state of IME to a protocol buffer output stream.
      *
-     * @param fd The file descriptor to which proto dump should be written.
-     * @param args The arguments passed to the dump method.
+     * @param proto ProtoOutputStream to dump data to.
      * @hide
      */
     @SuppressWarnings("HiddenAbstractMethod")
-    abstract void dumpProtoInternal(FileDescriptor fd, String[] args);
+    public abstract void dumpProtoInternal(ProtoOutputStream proto);
 
     /**
      * Implement this to handle {@link android.os.Binder#dump Binder.dump()}