commit ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf
author Robert Greenwalt <rgreenwalt@google.com> Sat Sep 27 00:09:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 27 00:09:02 2014 +0000
tree f2b4e722290c26fe08f1904467a007d8d2e06060
parent ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6
parent 37155e96332834955769d7f8e00dc391f72c61ac

Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev

src/com/android/settings/CryptKeeperConfirm.java

diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 7641525..4d6f26b 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -35,8 +35,12 @@
 
 import com.android.internal.widget.LockPatternUtils;
 
+import java.util.Locale;
+
 public class CryptKeeperConfirm extends Fragment {
 
+    private static final String TAG = "CryptKeeperConfirm";
+
     public static class Blank extends Activity {
         private Handler mHandler = new Handler();
 
@@ -107,17 +111,26 @@
                is then persisted, and the settings will be there on future
                reboots.
              */
+
+            // 1. The owner info.
             LockPatternUtils utils = new LockPatternUtils(getActivity());
             utils.setVisiblePatternEnabled(utils.isVisiblePatternEnabled());
             if (utils.isOwnerInfoEnabled()) {
                 utils.setOwnerInfo(utils.getOwnerInfo(UserHandle.USER_OWNER),
                                    UserHandle.USER_OWNER);
             }
-
             Intent intent = new Intent(getActivity(), Blank.class);
             intent.putExtras(getArguments());
-
             startActivity(intent);
+
+            // 2. The system locale.
+            try {
+                IBinder service = ServiceManager.getService("mount");
+                IMountService mountService = IMountService.Stub.asInterface(service);
+                mountService.setField("SystemLocale", Locale.getDefault().toLanguageTag());
+            } catch (Exception e) {
+                Log.e(TAG, "Error storing locale for decryption UI", e);
+            }
         }
     };