diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 63c9822d82c8c..3b6c62b5f111b 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1960,14 +1960,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub throw new IllegalArgumentException("Unknown id: " + id); } - if (mCurClient != null && mCurAttribute != null) { - // We have already made sure that the package name belongs to the application's UID. - // No further UID check is required. - if (SystemConfig.getInstance().getFixedImeApps().contains(mCurAttribute.packageName)) { - return; - } - } - // See if we need to notify a subtype change within the same IME. if (id.equals(mCurMethodId)) { final int subtypeCount = info.getSubtypeCount(); diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index 1c1784ec36688..73d8bddc5e609 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -105,9 +105,6 @@ public class SystemConfig { // background while in data-usage save mode, as read from the configuration files. final ArraySet mAllowInDataUsageSave = new ArraySet<>(); - // These are the app package names that should not allow IME switching. - final ArraySet mFixedImeApps = new ArraySet<>(); - // These are the package names of apps which should be in the 'always' // URL-handling state upon factory reset. final ArraySet mLinkedApps = new ArraySet<>(); @@ -159,10 +156,6 @@ public class SystemConfig { return mAllowInDataUsageSave; } - public ArraySet getFixedImeApps() { - return mFixedImeApps; - } - public ArraySet getLinkedApps() { return mLinkedApps; } @@ -411,17 +404,6 @@ public class SystemConfig { XmlUtils.skipCurrentTag(parser); continue; - } else if ("fixed-ime-app".equals(name) && allowAll) { - String pkgname = parser.getAttributeValue(null, "package"); - if (pkgname == null) { - Slog.w(TAG, " without package in " + permFile + " at " - + parser.getPositionDescription()); - } else { - mFixedImeApps.add(pkgname); - } - XmlUtils.skipCurrentTag(parser); - continue; - } else if ("app-link".equals(name) && allowAppConfigs) { String pkgname = parser.getAttributeValue(null, "package"); if (pkgname == null) {