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

Fix the NPE in InputMethodSubtype#setSubtypeNameOverride.

Browse Source 
Bug: 276791359
Test: Locally verified with IMEs.
Change-Id: I64361497feb5e4713cf2c079661200dc961e8650
This commit is contained in:
Shu Chen
2023-04-04 16:56:16 +08:00
parent 39124a5198
commit 1fd19176d9
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());
}
}