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

Merge "Remove code that sets user.* system properties."

Browse Source
This commit is contained in:
Narayan Kamath
2015-02-13 11:57:38 +00:00
committed by Gerrit Code Review
parent ec403e8f47 70e8f6600d
commit b4a5c04c30
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16294,10 +16294,11 @@ public final class ActivityManagerService extends ActivityManagerNative
EventLog.writeEvent(EventLogTags.CONFIGURATION_CHANGED, changes); EventLog.writeEvent(EventLogTags.CONFIGURATION_CHANGED, changes);
if (values.locale != null && !initLocale) { if (!initLocale && values.locale != null && values.userSetLocale) {
saveLocaleLocked(values.locale, final String languageTag = values.locale.toLanguageTag();
!values.locale.equals(mConfiguration.locale), SystemProperties.set("persist.sys.locale", languageTag);
values.userSetLocale); mHandler.sendMessage(mHandler.obtainMessage(SEND_LOCALE_TO_MOUNT_DAEMON_MSG,
values.locale));
} }
mConfigurationSeq++; mConfigurationSeq++;
@@ -16403,27 +16404,6 @@ public final class ActivityManagerService extends ActivityManagerNative
&& config.touchscreen == Configuration.TOUCHSCREEN_NOTOUCH); && config.touchscreen == Configuration.TOUCHSCREEN_NOTOUCH);
} }
/**
* Save the locale. You must be inside a synchronized (this) block.
*/
private void saveLocaleLocked(Locale l, boolean isDiff, boolean isPersist) {
final String languageTag = l.toLanguageTag();
if (isDiff) {
SystemProperties.set("user.locale", languageTag);
// TODO: Who uses these ? There are no references to these system
// properties in documents or code. Did the author intend to call
// System.setProperty() instead ? Even that wouldn't have any effect.
SystemProperties.set("user.language", l.getLanguage());
SystemProperties.set("user.region", l.getCountry());
}
if (isPersist) {
SystemProperties.set("persist.sys.locale", languageTag);
mHandler.sendMessage(mHandler.obtainMessage(SEND_LOCALE_TO_MOUNT_DAEMON_MSG, l));
}
}
@Override @Override
public boolean shouldUpRecreateTask(IBinder token, String destAffinity) { public boolean shouldUpRecreateTask(IBinder token, String destAffinity) {
synchronized (this) { synchronized (this) {