Merge "[Panlingual] Fix NPE when add language." into tm-dev

2022-05-12 14:39:27 +00:00
parent b1dd0c9e04 c87751b0c2
commit 5c23d0292d
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/app/LocalePickerWithRegion.java
+++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java
@@ -340,7 +340,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
            inflater.inflate(R.menu.language_selection_list, menu);

            final MenuItem searchMenuItem = menu.findItem(R.id.locale_search_menu);
-            if (!mAppPackageName.isEmpty() && mOnActionExpandListener != null) {
+            if (!TextUtils.isEmpty(mAppPackageName) && mOnActionExpandListener != null) {
                searchMenuItem.setOnActionExpandListener(mOnActionExpandListener);
            }