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

Commit 3ef4ddf3 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iee4b69ace47ff27717fed342c4946230f750395c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3d2b375 5c23d029

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }