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

Merge "Default 'persist.sys.timezone' property to GMT if not set on init." am: 302b7a7075

Browse Source 
am: 2f5a9febf4

Change-Id: I43c05ca3f139fce4e08c7c40cc3823821341d176
This commit is contained in:
Przemyslaw Szczepaniak
2017-03-23 14:29:17 +00:00
committed by android-build-merger
parent 88e9c86822 2f5a9febf4
commit 0276998354
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/SystemServer.java
View File

@@ -236,6 +236,15 @@ public final class SystemServer {
SystemClock.setCurrentTimeMillis(EARLIEST_SUPPORTED_TIME);
}
//
// Default the timezone property to GMT if not set.
//
String timezoneProperty = SystemProperties.get("persist.sys.timezone");
if (timezoneProperty == null || timezoneProperty.isEmpty()) {
Slog.w(TAG, "Timezone not set; setting to GMT.");
SystemProperties.set("persist.sys.timezone", "GMT");
}
// If the system has "persist.sys.language" and friends set, replace them with
// "persist.sys.locale". Note that the default locale at this point is calculated
// using the "-Duser.locale" command line flag. That flag is usually populated by