From c87751b0c2d29c046c2ab816131cd469b488da0f Mon Sep 17 00:00:00 2001
From: Tom Hsu <tomhsu@google.com>
Date: Thu, 12 May 2022 08:24:41 +0000
Subject: [PATCH] [Panlingual] Fix NPE when add language.

Bug: b/232348161
Test: local

Change-Id: Ibd55603aebb72eea3e9b2b8c32177f73997cdeee
---
 core/java/com/android/internal/app/LocalePickerWithRegion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java
index 2247e2f9a9fcf..965895f08d6e0 100644
--- 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);
             }