From 1fd19176d99e73bdf318a1c82c1688c5ce35ec6a Mon Sep 17 00:00:00 2001
From: Shu Chen <shuchen@google.com>
Date: Tue, 4 Apr 2023 16:56:16 +0800
Subject: [PATCH] Fix the NPE in InputMethodSubtype#setSubtypeNameOverride.

Bug: 276791359
Test: Locally verified with IMEs.
Change-Id: I64361497feb5e4713cf2c079661200dc961e8650
---
 .../android/server/inputmethod/AdditionalSubtypeUtils.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java
index c05a03ee1d2dc..c76ca2beda964 100644
--- a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java
+++ b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java
@@ -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());
                 }
             }