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

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

Browse Source
This commit is contained in:
Vaibhav Devmurari
2023-02-16 11:11:41 +00:00
committed by Android (Google) Code Review
parent 9db007eb45 200feaeef3
commit 356940fd89
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/inputmethod/InputMethodSubtype.java
View File

@@ -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();
}
/**

8
core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java
View File

@@ -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) {