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

Commit 7baae80a authored by Shu Chen's avatar Shu Chen Committed by Automerger Merge Worker
Browse files

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

Merge "Fix the NPE in InputMethodSubtype#setSubtypeNameOverride." into udc-dev am: 4b105fd9 am: 7ca50c13

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22410555



Change-Id: I3cc75efb7d18845f5a793dfd4e6f0aada93f862f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af4084a3 7ca50c13

services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -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());

                }

            }