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

Commit d74eebe2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Don\'t need this "feature" any more." into nyc-dev 

am: 34640a17

* commit '34640a17':
  Don't need this "feature" any more.
parents 109c8db4 34640a17

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

+0 −8
Original line number Diff line number Diff line
@@ -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();

services/core/java/com/android/server/SystemConfig.java

+0 −18
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ public class SystemConfig { 
    // background while in data-usage save mode, as read from the configuration files.

    final ArraySet<String> mAllowInDataUsageSave = new ArraySet<>();



    // These are the app package names that should not allow IME switching.

    final ArraySet<String> mFixedImeApps = new ArraySet<>();



    // These are the package names of apps which should be in the 'always'

    // URL-handling state upon factory reset.

    final ArraySet<String> mLinkedApps = new ArraySet<>();
@@ -159,10 +156,6 @@ public class SystemConfig { 
        return mAllowInDataUsageSave;

    }



    public ArraySet<String> getFixedImeApps() {

        return mFixedImeApps;

    }



    public ArraySet<String> 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, "<fixed-ime-app> 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) {