Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am: 9b9e823096
Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
This commit is contained in:
committed by
android-build-merger
commit
7dc29d076f
@@ -278,15 +278,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user