From 4c8fd97334452b65783c938a427dbc0c3f35d5ff Mon Sep 17 00:00:00 2001 From: tom hsu Date: Mon, 17 Oct 2022 16:16:30 +0800 Subject: [PATCH] Hanlde NPE when context from default phone is null. Bug: 253630907 Test: Maunal test Test: atest pass Change-Id: I577a78d70428e8f438e02115586e5de49d415019 --- core/java/com/android/internal/app/LocalePicker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 3c53d07b61808..999be08e0e04e 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -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 localeFilter = getLocaleFilter();