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

Commit 35412d63 authored by satok's avatar satok
Browse files

Fix NPE in InputMethodSubtype 

Change-Id: Iec8b2f95660db3edec18c2fc38db8f16395739b5
parent 9324e04d

core/java/android/view/inputmethod/InputMethodSubtype.java

+3 −3
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ public final class InputMethodSubtype implements Parcelable { 
        if (mSubtypeNameResId == 0) {

            return localeStr;

        }

        final String subtypeName = context.getPackageManager().getText(

                packageName, mSubtypeNameResId, appInfo).toString();

        final CharSequence subtypeName = context.getPackageManager().getText(

                packageName, mSubtypeNameResId, appInfo);

        if (!TextUtils.isEmpty(subtypeName)) {

            return String.format(subtypeName, localeStr);

            return String.format(subtypeName.toString(), localeStr);

        } else {

            return localeStr;

        }