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

Commit 1afc9e2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Simplify IMMS#dump() with ArrayUtils.contains()" into sc-dev am: 1a8b2fdd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13501287

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida2009025d060b8250d67dd4d60b42360d6e1904
parents 80f06c26 1a8b2fdd

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+2 −9
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ import com.android.internal.os.BackgroundThread; 
import com.android.internal.os.HandlerCaller;

import com.android.internal.os.SomeArgs;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.view.IInlineSuggestionsRequestCallback;

import com.android.internal.view.IInlineSuggestionsResponseCallback;
@@ -5229,15 +5230,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;



        boolean asProto = false;

        for (int argIndex = 0; argIndex < args.length; argIndex++) {

            if (args[argIndex].equals(PROTO_ARG)) {

                asProto = true;

                break;

            }

        }



        if (asProto) {

        if (ArrayUtils.contains(args, PROTO_ARG)) {

            final ImeTracing imeTracing = ImeTracing.getInstance();

            if (imeTracing.isEnabled()) {

                imeTracing.stopTrace(null, false /* writeToFile */);