am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
* commit 'b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca':
Ensure that the SIM language doesn't override the user language on the encryption UI.
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 @@
} 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());
}
/**