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

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

Simplify IMMS#setAdditionalInputMethodSubtypes() 

This CL does nothing but simplifies

  InputMethodManagerService#setAdditionalInputMethodSubtypes()

without changing any observable behavior.

Bug: 234882948
Test: atest CtsInputMethodTestCases:InputMethodSubtypeTest
Change-Id: I3f64bdc899a9f973885715dcaadd30ef58c21a59
parent a6a20724

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

+18 −20
Original line number Diff line number Diff line
@@ -178,6 +178,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;
@@ -4190,14 +4191,15 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                Slog.e(TAG, "Failed to get package infos");

                return;

            }

            if (packageInfos != null) {

                final int packageNum = packageInfos.length;

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

                    if (packageInfos[i].equals(imi.getPackageName())) {

                        if (subtypes.length > 0) {

                            mAdditionalSubtypeMap.put(imi.getId(), toBeAdded);

                        } else {

            if (ArrayUtils.find(packageInfos,

                    packageInfo -> TextUtils.equals(packageInfo, imi.getPackageName())) == null) {

                return;

            }



            if (toBeAdded.isEmpty()) {

                mAdditionalSubtypeMap.remove(imi.getId());

            } else {

                mAdditionalSubtypeMap.put(imi.getId(), toBeAdded);

            }

            AdditionalSubtypeUtils.save(mAdditionalSubtypeMap, mMethodMap,

                    mSettings.getCurrentUserId());
@@ -4207,10 +4209,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
            } finally {

                Binder.restoreCallingIdentity(ident);

            }

                        return;

                    }

                }

            }

        }

    }