summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-07-27 13:01:05 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-07-27 13:01:05 +0000
commit9b9e823096ebee3a39e1a3e36b6c6a60f2f38d05 (patch)
tree3b277ac662cfc896bfda2d98c31b1faeb6dd424a
parentc3fd3b8c7d57289622aaa3a4fadd3f51e4381e95 (diff)
parent27c461ab3c683ecb9cce7a0b1950672371b3079f (diff)
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
-rw-r--r--services/java/com/android/server/SystemServer.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 99ad00b65d18..ca2b89ee3194 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -241,15 +241,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