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

Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657

Browse Source 
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
This commit is contained in:
Seigo Nonaka
2016-05-26 04:17:39 +00:00
committed by android-build-merger
parent f2a8ea9523 b03e7217f3
commit d34ca400c6
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/provider/Settings.java
View File

@@ -2230,19 +2230,37 @@ public final class Settings {
* @param outConfig Where to place the configuration settings.
*/
public static void getConfiguration(ContentResolver cr, Configuration outConfig) {
getConfigurationForUser(cr, outConfig, UserHandle.myUserId());
adjustConfigurationForUser(cr, outConfig, UserHandle.myUserId(),
false /* updateSettingsIfEmpty */);
}
/** @hide */
public static void getConfigurationForUser(ContentResolver cr, Configuration outConfig,
int userHandle) {
public static void adjustConfigurationForUser(ContentResolver cr, Configuration outConfig,
int userHandle, boolean updateSettingsIfEmpty) {
outConfig.fontScale = Settings.System.getFloatForUser(
cr, FONT_SCALE, DEFAULT_FONT_SCALE, userHandle);
if (outConfig.fontScale < 0) {
outConfig.fontScale = DEFAULT_FONT_SCALE;
}
outConfig.setLocales(LocaleList.forLanguageTags(
Settings.System.getStringForUser(cr, SYSTEM_LOCALES, userHandle)));
final String localeValue =
Settings.System.getStringForUser(cr, SYSTEM_LOCALES, userHandle);
if (localeValue != null) {
outConfig.setLocales(LocaleList.forLanguageTags(localeValue));
} else {
// Do not update configuration with emtpy settings since we need to take over the
// locale list of previous user if the settings value is empty. This happens when a
// new user is created.
if (updateSettingsIfEmpty) {
// Make current configuration persistent. This is necessary the first time a
// user log in. At the first login, the configuration settings are empty, so we
// need to store the adjusted configuration as the initial settings.
Settings.System.putStringForUser(
cr, SYSTEM_LOCALES, outConfig.getLocales().toLanguageTags(),
userHandle);
}
}
}
/**

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -18306,8 +18306,8 @@ public final class ActivityManagerService extends ActivityManagerNative
void updateUserConfigurationLocked() {
Configuration configuration = new Configuration(mConfiguration);
Settings.System.getConfigurationForUser(mContext.getContentResolver(), configuration,
mUserController.getCurrentUserIdLocked());
Settings.System.adjustConfigurationForUser(mContext.getContentResolver(), configuration,
mUserController.getCurrentUserIdLocked(), Settings.System.canWrite(mContext));
updateConfigurationLocked(configuration, null, false);
}