From 9c33f28d912c9b51bff69e3eaad7090a6b8a3ec3 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 13 Oct 2014 12:39:56 -0700
Subject: [PATCH] Ensure that the SIM language doesn't override the user
 language on the encryption UI.

Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
---
 services/core/java/com/android/server/MountService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index b0535b3c2a4c2..976e707d418fd 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -860,6 +860,11 @@ class MountService extends IMountService.Stub
         } catch (RemoteException e) {
             Slog.e(TAG, "Error setting system locale from mount service", e);
         }
+
+        // Temporary workaround for http://b/17945169.
+        Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service");
+        SystemProperties.set("persist.sys.language", locale.getLanguage());
+        SystemProperties.set("persist.sys.country", locale.getCountry());
     }
 
     /**