Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc29d07 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by android-build-merger
Browse files

Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""

am: 9b9e8230

Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
parents 19d39ee3 9b9e8230
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -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