Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7dbd19 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android Build Coastguard Worker
Browse files

Revert "IME traces: remove unused fields" 

This reverts commit 796121b6.

Reason for revert: Droidfood blocking bug: b/329018076
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:09c1a0e7fb06177847c289496cd843efe897c677)
Merged-In: I5dc00dde76c0a0a13a18d9e74d6983226a228ea3
Change-Id: I5dc00dde76c0a0a13a18d9e74d6983226a228ea3
parent 6526e0e0

core/java/com/android/internal/inputmethod/EditableInputConnection.java

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.internal.inputmethod;



import static android.view.inputmethod.InputConnectionProto.CURSOR_CAPS_MODE;

import static android.view.inputmethod.InputConnectionProto.EDITABLE_TEXT;

import static android.view.inputmethod.InputConnectionProto.SELECTED_TEXT;

import static android.view.inputmethod.InputConnectionProto.SELECTED_TEXT_END;

import static android.view.inputmethod.InputConnectionProto.SELECTED_TEXT_START;
@@ -333,6 +335,16 @@ public final class EditableInputConnection extends BaseInputConnection 
    @Override

    public void dumpDebug(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        CharSequence editableText = mTextView.getText();

        CharSequence selectedText = getSelectedText(0 /* flags */);

        if (InputConnectionProtoDumper.DUMP_TEXT) {

            if (editableText != null) {

                proto.write(EDITABLE_TEXT, editableText.toString());

            }

            if (selectedText != null) {

                proto.write(SELECTED_TEXT, selectedText.toString());

            }

        }

        final Editable content = getEditable();

        if (content != null) {

            int start = Selection.getSelectionStart(content);

core/java/com/android/internal/inputmethod/InputConnectionProtoDumper.java

+30 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.inputmethod.SurroundingText; 
 */

public final class InputConnectionProtoDumper {

    static final String TAG = "InputConnectionProtoDumper";

    public static final boolean DUMP_TEXT = false;



    private InputConnectionProtoDumper() {}
@@ -66,6 +67,11 @@ public final class InputConnectionProtoDumper { 
        final long token = proto.start(GET_TEXT_AFTER_CURSOR);

        proto.write(GetTextAfterCursor.LENGTH, length);

        proto.write(GetTextAfterCursor.FLAGS, flags);

        if (result == null) {

            proto.write(GetTextAfterCursor.RESULT, "null result");

        } else if (DUMP_TEXT) {

            proto.write(GetTextAfterCursor.RESULT, result.toString());

        }

        proto.end(token);

        return proto.getBytes();

    }
@@ -89,6 +95,11 @@ public final class InputConnectionProtoDumper { 
        final long token = proto.start(GET_TEXT_BEFORE_CURSOR);

        proto.write(GetTextBeforeCursor.LENGTH, length);

        proto.write(GetTextBeforeCursor.FLAGS, flags);

        if (result == null) {

            proto.write(GetTextBeforeCursor.RESULT, "null result");

        } else if (DUMP_TEXT) {

            proto.write(GetTextBeforeCursor.RESULT, result.toString());

        }

        proto.end(token);

        return proto.getBytes();

    }
@@ -111,6 +122,11 @@ public final class InputConnectionProtoDumper { 
        ProtoOutputStream proto = new ProtoOutputStream();

        final long token = proto.start(GET_SELECTED_TEXT);

        proto.write(GetSelectedText.FLAGS, flags);

        if (result == null) {

            proto.write(GetSelectedText.RESULT, "null result");

        } else if (DUMP_TEXT) {

            proto.write(GetSelectedText.RESULT, result.toString());

        }

        proto.end(token);

        return proto.getBytes();

    }
@@ -139,8 +155,13 @@ public final class InputConnectionProtoDumper { 
        proto.write(GetSurroundingText.BEFORE_LENGTH, beforeLength);

        proto.write(GetSurroundingText.AFTER_LENGTH, afterLength);

        proto.write(GetSurroundingText.FLAGS, flags);

        if (result != null) {

        if (result == null) {

            final long token_result = proto.start(GetSurroundingText.RESULT);

            proto.write(GetSurroundingText.SurroundingText.TEXT, "null result");

            proto.end(token_result);

        } else if (DUMP_TEXT) {

            final long token_result = proto.start(GetSurroundingText.RESULT);

            proto.write(GetSurroundingText.SurroundingText.TEXT, result.getText().toString());

            proto.write(GetSurroundingText.SurroundingText.SELECTION_START,

                    result.getSelectionStart());

            proto.write(GetSurroundingText.SurroundingText.SELECTION_END,
@@ -167,7 +188,9 @@ public final class InputConnectionProtoDumper { 
        ProtoOutputStream proto = new ProtoOutputStream();

        final long token = proto.start(GET_CURSOR_CAPS_MODE);

        proto.write(GetCursorCapsMode.REQ_MODES, reqModes);

        if (DUMP_TEXT) {

            proto.write(GetCursorCapsMode.RESULT, result);

        }

        proto.end(token);

        return proto.getBytes();

    }
@@ -200,6 +223,11 @@ public final class InputConnectionProtoDumper { 
        proto.write(GetExtractedText.ExtractedTextRequest.HINT_MAX_CHARS, request.hintMaxChars);

        proto.end(token_request);

        proto.write(GetExtractedText.FLAGS, flags);

        if (result == null) {

            proto.write(GetExtractedText.RESULT, "null result");

        } else if (DUMP_TEXT) {

            proto.write(GetExtractedText.RESULT, result.text.toString());

        }

        proto.end(token);

        return proto.getBytes();

    }

core/proto/android/view/inputmethod/inputconnection.proto

+9 −7
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


syntax = "proto2";



import "frameworks/base/core/proto/android/privacy.proto";



package android.view.inputmethod;



option java_multiple_files = true;
@@ -24,8 +26,8 @@ option java_multiple_files = true; 
 * Represents a {@link android.view.inputmethod.InputConnection} object.

 */

message InputConnectionProto {

  reserved 1; // string editable_text

  reserved 2; // string selected_text

  optional string editable_text = 1 [(.android.privacy).dest = DEST_LOCAL];

  optional string selected_text = 2 [(.android.privacy).dest = DEST_LOCAL];

  optional int32 selected_text_start = 3;

  optional int32 selected_text_end = 4;

  optional int32 cursor_caps_mode = 5;
@@ -48,18 +50,18 @@ message InputConnectionCallProto { 
  message GetTextBeforeCursor {

    optional int32 length = 1;

    optional int32 flags = 2;

    reserved 3; // string result

    optional string result = 3 [(.android.privacy).dest = DEST_LOCAL];

  }



  message GetTextAfterCursor {

    optional int32 length = 1;

    optional int32 flags = 2;

    reserved 3; // string result = 3

    optional string result = 3 [(.android.privacy).dest = DEST_LOCAL];

  }



  message GetSelectedText {

    optional int32 flags = 1;

    reserved 2; // string result = 2

    optional string result = 2 [(.android.privacy).dest = DEST_LOCAL];

  }



  message GetSurroundingText {
@@ -69,7 +71,7 @@ message InputConnectionCallProto { 
    optional SurroundingText result = 4;



    message SurroundingText {

      reserved 1; // string text = 1

      optional string text = 1 [(.android.privacy).dest = DEST_LOCAL];

      optional int32 selection_start = 2;

      optional int32 selection_end = 3;

      optional int32 offset = 4;
@@ -84,7 +86,7 @@ message InputConnectionCallProto { 
  message GetExtractedText {

    optional ExtractedTextRequest request = 1;

    optional int32 flags = 2;

    reserved 3; // string result = 3

    optional string result = 3 [(.android.privacy).dest = DEST_LOCAL];



    message ExtractedTextRequest {

      optional int32 token = 1;