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

Commit b1793891 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Use String[] for IMMS#mNonPreemptibleInputMethods 

This is a safe optimization for our previous CL [1], which introduced

  InputMethodManagerService#mNonPreemptibleInputMethods

as HashSet.

Since it is almost always empty for phones and is expected to have
only a few entries for certain form factors such as TV, using HashSet
is most likely overkill.

Let's just use String[] and ArrayUtils.contains() for simplicity.

There should be no observable behavior change in this CL.

 [1]: Id0aaa496ee46532d0e97c236df7e073947ababcd
      76a3c8c9

Bug: 216618758
Test: presubmit
Change-Id: I7269306f56df4d083de31a2d9d5b49856f9a9f5d
parent fc48388a

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

+5 −7
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ import com.android.internal.inputmethod.UnbindReason; 
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.view.IInputMethodManager;
@@ -195,8 +196,6 @@ import com.android.server.statusbar.StatusBarManagerService; 
import com.android.server.utils.PriorityDump;

import com.android.server.wm.WindowManagerInternal;



import com.google.android.collect.Sets;



import java.io.FileDescriptor;

import java.io.IOException;

import java.io.PrintWriter;
@@ -211,7 +210,6 @@ import java.util.List; 
import java.util.Locale;

import java.util.Objects;

import java.util.OptionalInt;

import java.util.Set;

import java.util.WeakHashMap;

import java.util.concurrent.CopyOnWriteArrayList;

import java.util.concurrent.Future;
@@ -283,7 +281,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
     * {@link #mPreventImeStartupUnlessTextEditor}.

     */

    @NonNull

    private final Set<String> mNonPreemptibleInputMethods;

    private final String[] mNonPreemptibleInputMethods;



    @UserIdInt

    private int mLastSwitchUserId;
@@ -1777,8 +1775,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        mAutofillController = new AutofillSuggestionsController(this);

        mPreventImeStartupUnlessTextEditor = mRes.getBoolean(

                com.android.internal.R.bool.config_preventImeStartupUnlessTextEditor);

        mNonPreemptibleInputMethods = Sets.newHashSet(mRes.getStringArray(

                com.android.internal.R.array.config_nonPreemptibleInputMethods));

        mNonPreemptibleInputMethods = mRes.getStringArray(

                com.android.internal.R.array.config_nonPreemptibleInputMethods);

        mHwController = new HandwritingModeController(thread.getLooper(),

                new InkWindowInitializer());

        registerDeviceListenerAndCheckStylusSupport();
@@ -2619,7 +2617,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    private boolean isNonPreemptibleImeLocked(@NonNull  String selectedMethodId) {

        final InputMethodInfo imi = mMethodMap.get(selectedMethodId);

        if (imi != null) {

            return mNonPreemptibleInputMethods.contains(imi.getPackageName());

            return ArrayUtils.contains(mNonPreemptibleInputMethods, imi.getPackageName());

        }

        return false;

    }