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

* commit '9b8055b337c5b3efe80d87d318bf0d1df67ecf14': Fix a regression in exiting the activity on picking a locale
2012-10-11 18:27:53 -07:00
parent 552bebe04f 9b8055b337
commit 85cd2c5625
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -55,6 +55,7 @@ public class LocalePicker extends com.android.internal.app.LocalePicker
            mTargetLocale = locale;
            showDialog(DLG_SHOW_GLOBAL_WARNING);
        } else {
+            getActivity().onBackPressed();
            LocalePicker.updateLocale(locale);
        }
    }