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

Commit 15707555 authored by Shu Chen's avatar Shu Chen Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Removes additional subtypes when clearing data. am: 0962b36f 

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



Change-Id: Ifa76a3fa16d318dc0da2a5291366edf32f497279
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adb36b27 0962b36f

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

+16 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,22 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
            }

        }



        @Override

        public void onPackageDataCleared(String packageName, int uid) {

            boolean changed = false;

            for (InputMethodInfo imi : mMethodList) {

                if (imi.getPackageName().equals(packageName)) {

                    mAdditionalSubtypeMap.remove(imi.getId());

                    changed = true;

                }

            }

            if (changed) {

                AdditionalSubtypeUtils.save(

                        mAdditionalSubtypeMap, mMethodMap, mSettings.getCurrentUserId());

                mChangedPackages.add(packageName);

            }

        }



        @Override

        public void onFinishPackageChanges() {

            onFinishPackageChangesInternal();