Merge "[Panlingual] Fix NPE when add language." into tm-dev am: 5c23d0292d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18330351 Change-Id: I8660bf9330ed7535e93aac46f62aacfaea448da8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -340,7 +340,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
|
|||||||
inflater.inflate(R.menu.language_selection_list, menu);
|
inflater.inflate(R.menu.language_selection_list, menu);
|
||||||
|
|
||||||
final MenuItem searchMenuItem = menu.findItem(R.id.locale_search_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);
|
searchMenuItem.setOnActionExpandListener(mOnActionExpandListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user