Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am: 9b9e823096 am: 7dc29d076f

am: 18eb3b4ff1

Change-Id: Id90d02a05413812df90a3691f1f4b8a99e74669b
This commit is contained in:
Przemyslaw Szczepaniak
2017-07-27 13:24:07 +00:00
committed by android-build-merger

View File

@@ -282,15 +282,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