Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
This commit is contained in:
Elliott Hughes
2014-10-13 22:35:53 +00:00
committed by Android Git Automerger
parent 86195bd9a3 b8175ad3bf
commit 81fcede86d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/MountService.java
View File

@@ -860,6 +860,11 @@ class MountService extends IMountService.Stub
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Error setting system locale from mount service", 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());
} }
/** /**