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

Merge "Fix the NPE in InputMethodSubtype#setSubtypeNameOverride." into udc-dev

Browse Source
This commit is contained in:
Shu Chen
2023-04-07 06:08:17 +00:00
committed by Android (Google) Code Review
parent f37f9d12c2 1fd19176d9
commit 4b105fd9bf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java
View File

@@ -286,7 +286,6 @@ final class AdditionalSubtypeUtils {
final InputMethodSubtype.InputMethodSubtypeBuilder
builder = new InputMethodSubtype.InputMethodSubtypeBuilder()
.setSubtypeNameResId(label)
.setSubtypeNameOverride(untranslatableName)
.setPhysicalKeyboardHint(
pkLanguageTag == null ? null : new ULocale(pkLanguageTag),
pkLayoutType == null ? "" : pkLayoutType)
@@ -302,6 +301,9 @@ final class AdditionalSubtypeUtils {
if (subtypeId != InputMethodSubtype.SUBTYPE_ID_NONE) {
builder.setSubtypeId(subtypeId);
}
if (untranslatableName != null) {
builder.setSubtypeNameOverride(untranslatableName);
}
tempSubtypesArray.add(builder.build());
}
}