Merge "Don't directly return to the parent frame" into main (f4ac8c32) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@ import android.widget.SearchView;

	import com.android.internal.R;		import com.android.internal.R;

	import java.util.HashSet;
	import java.util.Locale;		import java.util.Locale;
	import java.util.Set;		import java.util.Set;

	@@ -273,8 +272,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
	\|\| mIsNumberingSystem) {		\|\| mIsNumberingSystem) {
	if (mListener != null) {		if (mListener != null) {
	mListener.onLocaleSelected(locale);		mListener.onLocaleSelected(locale);
	}		} else {
	returnToParentFrame();		returnToParentFrame();
			}
	} else {		} else {
	LocalePickerWithRegion selector;		LocalePickerWithRegion selector;
	if (mayHaveDifferentNumberingSystem) {		if (mayHaveDifferentNumberingSystem) {