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

Commit c84cc4f1 authored by Lavettacn Xiao's avatar Lavettacn Xiao Committed by Johan Redestig
Browse files

Check if we are in daylight time when calculating timezone 

The code that calculates the Kernel TimeZone does not check
if we are actually in daylite time prior updating the kernel
time zone. Use TimeZone.getOffset which checks for daylight
savings. Also updated setTimeZone for consistency.

Change-Id: I44565bc8df48e81370ea3bfbb099a6a5675e343d
parent 08d9d9a4

services/java/com/android/server/AlarmManagerService.java

+3 −7
Original line number Diff line number Diff line
@@ -281,10 +281,7 @@ class AlarmManagerService extends IAlarmManager.Stub { 
            

            // Update the kernel timezone information

            // Kernel tracks time offsets as 'minutes west of GMT'

            int gmtOffset = zone.getRawOffset();

            if (zone.inDaylightTime(new Date(System.currentTimeMillis()))) {

                gmtOffset += zone.getDSTSavings();

            }

            int gmtOffset = zone.getOffset(System.currentTimeMillis());

            setKernelTimezone(mDescriptor, -(gmtOffset / 60000));

        }
@@ -784,9 +781,8 @@ class AlarmManagerService extends IAlarmManager.Stub { 
                // based off of the current Zone gmt offset + userspace tracked

                // daylight savings information.

                TimeZone zone = TimeZone.getTimeZone(SystemProperties.get(TIMEZONE_PROPERTY));

                int gmtOffset = (zone.getRawOffset() + zone.getDSTSavings()) / 60000;



                setKernelTimezone(mDescriptor, -(gmtOffset));

                int gmtOffset = zone.getOffset(System.currentTimeMillis());

                setKernelTimezone(mDescriptor, -(gmtOffset / 60000));

            	scheduleDateChangedEvent();

            }

        }