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

Commit bf5adfa5 authored by Conley Owens's avatar Conley Owens Committed by Android Code Review
Browse files

Merge "Check if we are in daylight time when calculating timezone"

parents e3b05d09 c84cc4f1

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();

            }

        }