commit 35201c97f7414700d7acc8c809e3dc97be49ea27
author Tom Hsu <tomhsu@google.com> Thu May 12 14:53:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 12 14:53:07 2022 +0000
tree a9aaf26c2c17c850086b9547d50e1047c202d791
parent 8297548aa4db896cc8fa590e4a91f239ccb122c1
parent 7239e760892b5b10f9e6174b2a628d3a1eedada1

Merge "[Panlingual] Fix NPE when add language." into tm-dev am: 5c23d0292d am: 7239e76089

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18330351

Change-Id: I28636ed8e3ff0a2446ab53ba04b88d244cd81d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java
index 2247e2f..965895f 100644
--- a/core/java/com/android/internal/app/LocalePickerWithRegion.java
+++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java
@@ -340,7 +340,7 @@
             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);
             }