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

Commit 356940fd authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Allow ImeSutype with null languagtag to be passed to IMS"

parents 9db007eb 200feaee

core/java/android/view/inputmethod/InputMethodSubtype.java

+1 −8
Original line number Diff line number Diff line
@@ -536,14 +536,7 @@ public final class InputMethodSubtype implements Parcelable { 
        if (!TextUtils.equals(getMode(), SUBTYPE_MODE_KEYBOARD)) {

            return false;

        }

        if (isAuxiliary()) {

            return false;

        }

        final String langTag = getCanonicalizedLanguageTag();

        if (langTag.isEmpty() || TextUtils.equals(langTag, UNDEFINED_LANGUAGE_TAG)) {

            return false;

        }

        return true;

        return !isAuxiliary();

    }



    /**

core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java

+0 −8
Original line number Diff line number Diff line
@@ -176,14 +176,6 @@ public class InputMethodSubtypeTest { 
        // Auxiliary subtype not suitable.

        assertFalse(getValidBuilder.get().setIsAuxiliary(true).build()

                .isSuitableForPhysicalKeyboardLayoutMapping());



        // languageTag == null is not suitable.

        assertFalse(getValidBuilder.get().setLanguageTag(null).build()

                .isSuitableForPhysicalKeyboardLayoutMapping());



        // languageTag == "und" is not suitable.

        assertFalse(getValidBuilder.get().setLanguageTag("und").build()

                .isSuitableForPhysicalKeyboardLayoutMapping());

    }



    private static InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) {