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

Commit d7573df0 authored by allenwtsu's avatar allenwtsu
Browse files

[Panlingual]Fix NPE in AppLocalePickerActivityTest 

Bug: 263761231
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppLocalePickerActivityTest
Change-Id: I337a395d4227b169960d11b10f367be55531225a
parent 0bed9983

core/java/com/android/internal/app/AppLocaleCollector.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -120,11 +120,13 @@ public class AppLocaleCollector implements LocalePickerWithRegion.LocaleCollecto 
        List<InputMethodInfo> infoList = imm.getEnabledInputMethodList();

        List<InputMethodInfo> infoList = imm.getEnabledInputMethodList();

        String imeId = Settings.Secure.getStringForUser(mContext.getContentResolver(),

        String imeId = Settings.Secure.getStringForUser(mContext.getContentResolver(),

                Settings.Secure.DEFAULT_INPUT_METHOD, mContext.getUserId());

                Settings.Secure.DEFAULT_INPUT_METHOD, mContext.getUserId());

        if (infoList != null && imeId != null) {

            for (InputMethodInfo method : infoList) {

            for (InputMethodInfo method : infoList) {

                if (method.getId().equals(imeId)) {

                if (method.getId().equals(imeId)) {

                    activeIme = method;

                    activeIme = method;

                }

                }

            }

            }

        }

        return activeIme;

        return activeIme;

    }

    }