Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dump InputMethodManager#{mServedView, mNextServedView} for ime tracing"

Browse Source
This commit is contained in:
Ming-Shin Lu
2022-10-21 01:11:41 +00:00
committed by Android (Google) Code Review
parent 12fe6a4977 bb42ab032d
commit 85a70efe72
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -30,7 +30,9 @@ import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodCl
import static android.view.inputmethod.InputMethodManagerProto.ACTIVE;
import static android.view.inputmethod.InputMethodManagerProto.CUR_ID;
import static android.view.inputmethod.InputMethodManagerProto.FULLSCREEN_MODE;
import static android.view.inputmethod.InputMethodManagerProto.NEXT_SERVED_VIEW;
import static android.view.inputmethod.InputMethodManagerProto.SERVED_CONNECTING;
import static android.view.inputmethod.InputMethodManagerProto.SERVED_VIEW;
import static com.android.internal.inputmethod.StartInputReason.BOUND_TO_IMMS;
@@ -3990,6 +3992,8 @@ public final class InputMethodManager {
proto.write(FULLSCREEN_MODE, mFullscreenMode);
proto.write(ACTIVE, mActive);
proto.write(SERVED_CONNECTING, mServedConnecting);
proto.write(SERVED_VIEW, Objects.toString(mServedView));
proto.write(NEXT_SERVED_VIEW, Objects.toString(mNextServedView));
proto.end(token);
if (mCurRootView != null) {
mCurRootView.dumpDebug(proto, VIEW_ROOT_IMPL);

4
core/proto/android/view/imefocuscontroller.proto
View File

@@ -25,6 +25,6 @@ option java_multiple_files = true;
*/
message ImeFocusControllerProto {
optional bool has_ime_focus = 1;
optional string served_view = 2;
optional string next_served_view = 3;
optional string served_view = 2 [deprecated = true];
optional string next_served_view = 3 [deprecated = true];
}

2
core/proto/android/view/inputmethod/inputmethodmanager.proto
View File

@@ -29,4 +29,6 @@ message InputMethodManagerProto {
optional int32 display_id = 3;
optional bool active = 4;
optional bool served_connecting = 5;
optional string served_view = 6;
optional string next_served_view = 7;
}