Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shu Chen
2023-03-15 02:07:39 +00:00
committed by Android (Google) Code Review
parent 04f82f087e dc2a2ea7fe
commit cf1b792d85
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -1488,16 +1488,19 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
} }
int change = isPackageDisappearing(imi.getPackageName()); int change = isPackageDisappearing(imi.getPackageName());
if (isPackageModified(imi.getPackageName())) {
mAdditionalSubtypeMap.remove(imi.getId());
AdditionalSubtypeUtils.save(mAdditionalSubtypeMap, mMethodMap,
mSettings.getCurrentUserId());
}
if (change == PACKAGE_TEMPORARY_CHANGE if (change == PACKAGE_TEMPORARY_CHANGE
|| change == PACKAGE_PERMANENT_CHANGE) { || change == PACKAGE_PERMANENT_CHANGE) {
Slog.i(TAG, "Input method uninstalled, disabling: " Slog.i(TAG, "Input method uninstalled, disabling: "
+ imi.getComponent()); + imi.getComponent());
setInputMethodEnabledLocked(imi.getId(), false); 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());
} }
} }
} }