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

Commit 1dd7de6a authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Replace HashMap with ArrayMap in IMMS and InputMethodUtils 

With this CL, remaining use of HashMap in InputMethodManagerService
and InputMethodUtils will be replaced with ArrayMap.

There should be no user-visible behavior change because those
instances will never be used for object enumeration hence possible
difference in enumeration order does not matter.  Note that
InputMethodInfo is always enumerated with IMMS#mMethodList.

Fix: 119839847
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Iba29e55edc22478424b7bb276b61c9ac610bbc5b
parent ac9311eb

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

+12 −13
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ import java.text.SimpleDateFormat; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Locale;

import java.util.WeakHashMap;
@@ -322,7 +321,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    // All known input methods.  mMethodMap also serves as the global

    // lock for this class.

    final ArrayList<InputMethodInfo> mMethodList = new ArrayList<>();

    final HashMap<String, InputMethodInfo> mMethodMap = new HashMap<>();

    final ArrayMap<String, InputMethodInfo> mMethodMap = new ArrayMap<>();

    private final LruCache<SuggestionSpan, InputMethodInfo> mSecureSuggestionSpans =

            new LruCache<>(SECURE_SUGGESTION_SPANS_MAX_SIZE);

    private final InputMethodSubtypeSwitchingController mSwitchingController;
@@ -554,8 +553,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    private InputMethodSubtype mCurrentSubtype;



    // This list contains the pairs of InputMethodInfo and InputMethodSubtype.

    private final HashMap<InputMethodInfo, ArrayList<InputMethodSubtype>>

            mShortcutInputMethodsAndSubtypes = new HashMap<>();

    private final ArrayMap<InputMethodInfo, ArrayList<InputMethodSubtype>>

            mShortcutInputMethodsAndSubtypes = new ArrayMap<>();



    // Was the keyguard locked when this client became current?

    private boolean mCurClientInKeyguard;
@@ -3674,7 +3673,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                        | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS),

                mSettings.getCurrentUserId());



        final HashMap<String, List<InputMethodSubtype>> additionalSubtypeMap =

        final ArrayMap<String, List<InputMethodSubtype>> additionalSubtypeMap =

                mFileManager.getAllAdditionalInputMethodSubtypes();

        for (int i = 0; i < services.size(); ++i) {

            ResolveInfo ri = services.get(i);
@@ -4310,10 +4309,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        private static final String ATTR_IS_AUXILIARY = "isAuxiliary";

        private static final String ATTR_IS_ASCII_CAPABLE = "isAsciiCapable";

        private final AtomicFile mAdditionalInputMethodSubtypeFile;

        private final HashMap<String, InputMethodInfo> mMethodMap;

        private final HashMap<String, List<InputMethodSubtype>> mAdditionalSubtypesMap =

                new HashMap<>();

        public InputMethodFileManager(HashMap<String, InputMethodInfo> methodMap, int userId) {

        private final ArrayMap<String, InputMethodInfo> mMethodMap;

        private final ArrayMap<String, List<InputMethodSubtype>> mAdditionalSubtypesMap =

                new ArrayMap<>();

        InputMethodFileManager(ArrayMap<String, InputMethodInfo> methodMap, int userId) {

            if (methodMap == null) {

                throw new NullPointerException("methodMap is null");

            }
@@ -4365,15 +4364,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            }

        }



        public HashMap<String, List<InputMethodSubtype>> getAllAdditionalInputMethodSubtypes() {

        public ArrayMap<String, List<InputMethodSubtype>> getAllAdditionalInputMethodSubtypes() {

            synchronized (mMethodMap) {

                return mAdditionalSubtypesMap;

            }

        }



        private static void writeAdditionalInputMethodSubtypes(

                HashMap<String, List<InputMethodSubtype>> allSubtypes, AtomicFile subtypesFile,

                HashMap<String, InputMethodInfo> methodMap) {

                ArrayMap<String, List<InputMethodSubtype>> allSubtypes, AtomicFile subtypesFile,

                ArrayMap<String, InputMethodInfo> methodMap) {

            // Safety net for the case that this function is called before methodMap is set.

            final boolean isSetMethodMap = methodMap != null && methodMap.size() > 0;

            FileOutputStream fos = null;
@@ -4427,7 +4426,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        }



        private static void readAdditionalInputMethodSubtypes(

                HashMap<String, List<InputMethodSubtype>> allSubtypes, AtomicFile subtypesFile) {

                ArrayMap<String, List<InputMethodSubtype>> allSubtypes, AtomicFile subtypesFile) {

            if (allSubtypes == null || subtypesFile == null) return;

            allSubtypes.clear();

            try (final FileInputStream fis = subtypesFile.openRead()) {

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

+7 −7
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.LocaleList; 
import android.os.RemoteException;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Pair;

import android.util.Printer;

import android.util.Slog;
@@ -45,7 +46,6 @@ import com.android.internal.inputmethod.StartInputFlags; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.LinkedHashSet;

import java.util.List;

import java.util.Locale;
@@ -473,7 +473,7 @@ final class InputMethodUtils { 
        final int numSubtypes = subtypes.size();



        // Handle overridesImplicitlyEnabledSubtype mechanism.

        final HashMap<String, InputMethodSubtype> applicableModeAndSubtypesMap = new HashMap<>();

        final ArrayMap<String, InputMethodSubtype> applicableModeAndSubtypesMap = new ArrayMap<>();

        for (int i = 0; i < numSubtypes; ++i) {

            // scan overriding implicitly enabled subtypes.

            final InputMethodSubtype subtype = subtypes.get(i);
@@ -488,8 +488,8 @@ final class InputMethodUtils { 
            return new ArrayList<>(applicableModeAndSubtypesMap.values());

        }



        final HashMap<String, ArrayList<InputMethodSubtype>> nonKeyboardSubtypesMap =

                new HashMap<>();

        final ArrayMap<String, ArrayList<InputMethodSubtype>> nonKeyboardSubtypesMap =

                new ArrayMap<>();

        final ArrayList<InputMethodSubtype> keyboardSubtypes = new ArrayList<>();



        for (int i = 0; i < numSubtypes; ++i) {
@@ -761,12 +761,12 @@ final class InputMethodUtils { 


        private final Resources mRes;

        private final ContentResolver mResolver;

        private final HashMap<String, InputMethodInfo> mMethodMap;

        private final ArrayMap<String, InputMethodInfo> mMethodMap;



        /**

         * On-memory data store to emulate when {@link #mCopyOnWrite} is {@code true}.

         */

        private final HashMap<String, String> mCopyOnWriteDataStore = new HashMap<>();

        private final ArrayMap<String, String> mCopyOnWriteDataStore = new ArrayMap<>();



        private boolean mCopyOnWrite = false;

        @NonNull
@@ -812,7 +812,7 @@ final class InputMethodUtils { 


        public InputMethodSettings(

                Resources res, ContentResolver resolver,

                HashMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList,

                ArrayMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList,

                @UserIdInt int userId, boolean copyOnWrite) {

            mRes = res;

            mResolver = resolver;