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

Commit 0f5526c3 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Hanlde NPE when context from default phone is null."

parents a7027095 4c8fd973

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

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ public class LocalePicker extends ListFragment { 
    }



    public static String[] getSupportedLocales(Context context) {

        if (context == null) {

            return new String[0];

        }

        String[] allLocales = context.getResources().getStringArray(R.array.supported_locales);



        Predicate<String> localeFilter = getLocaleFilter();