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

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

Merge "Default 'persist.sys.timezone' property to GMT if not set on init." am: 302b7a70 

am: 2f5a9feb

Change-Id: I43c05ca3f139fce4e08c7c40cc3823821341d176
parents 88e9c868 2f5a9feb

services/java/com/android/server/SystemServer.java

+9 −0
Original line number Diff line number Diff line
@@ -236,6 +236,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