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

Commit 85cd2c56 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 

* commit '9b8055b3':
  Fix a regression in exiting the activity on picking a locale
parents 552bebe0 9b8055b3

src/com/android/settings/LocalePicker.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ public class LocalePicker extends com.android.internal.app.LocalePicker 
            mTargetLocale = locale;

            mTargetLocale = locale;

            showDialog(DLG_SHOW_GLOBAL_WARNING);

            showDialog(DLG_SHOW_GLOBAL_WARNING);

        } else {

        } else {

            getActivity().onBackPressed();

            LocalePicker.updateLocale(locale);

            LocalePicker.updateLocale(locale);

        }

        }

    }

    }