diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-13 20:55:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-13 20:55:30 +0000 |
| commit | c130b428c5d7eb25dc7651c5cea82182f2241ddf (patch) | |
| tree | 990fd2e6a1143605f7540f788313ba8f9817895a /services/core/java | |
| parent | 461b3896babdbfb365282378df89cde2dddb5a3a (diff) | |
| parent | 9c33f28d912c9b51bff69e3eaad7090a6b8a3ec3 (diff) | |
| download | frameworks_base-c130b428c5d7eb25dc7651c5cea82182f2241ddf.zip frameworks_base-c130b428c5d7eb25dc7651c5cea82182f2241ddf.tar.gz frameworks_base-c130b428c5d7eb25dc7651c5cea82182f2241ddf.tar.bz2 | |
Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/MountService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index b0535b3..976e707 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()); } /** |