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

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

Merge "Don't remove additional subtypes when ACTION_PACKAGE_CHANGED." into udc-dev am: cf1b792d 

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



Change-Id: I16baf071953e5c6485f89b232af5e3ccdd278bc9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ce969e8 cf1b792d

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

+8 −5
Original line number Diff line number Diff line
@@ -1488,16 +1488,19 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                        }



                        int change = isPackageDisappearing(imi.getPackageName());

                        if (isPackageModified(imi.getPackageName())) {

                            mAdditionalSubtypeMap.remove(imi.getId());

                            AdditionalSubtypeUtils.save(mAdditionalSubtypeMap, mMethodMap,

                                    mSettings.getCurrentUserId());

                        }

                        if (change == PACKAGE_TEMPORARY_CHANGE

                                || change == PACKAGE_PERMANENT_CHANGE) {

                            Slog.i(TAG, "Input method uninstalled, disabling: "

                                    + imi.getComponent());

                            setInputMethodEnabledLocked(imi.getId(), false);

                        } else if (change == PACKAGE_UPDATING) {

                            Slog.i(TAG,

                                    "Input method reinstalling, clearing additional subtypes: "

                                            + imi.getComponent());

                            mAdditionalSubtypeMap.remove(imi.getId());

                            AdditionalSubtypeUtils.save(mAdditionalSubtypeMap,

                                    mMethodMap,

                                    mSettings.getCurrentUserId());

                        }

                    }

                }