From 20e020536ebf999c4acb759960ae6e4bfff6ba67 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Wed, 22 Mar 2017 15:13:17 +0000 Subject: [PATCH] Default 'persist.sys.timezone' property to GMT if not set on init. Test: make, flashall -w and tested persist.sys.timezone value Bug: 36488101 Change-Id: I6d0dab1e247dd7c303153bbe0e997581e36a973d --- services/java/com/android/server/SystemServer.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index de4a55bc8d6a4..c907cf33c556f 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -235,6 +235,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