Merge "[Panlingual] Fix NPE when add language." into tm-dev (5c23d029) · Commits · e / os / android_frameworks_base

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);
		}