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

Commit 70c2a4c2 authored by Lavettacn Xiao's avatar Lavettacn Xiao Committed by Steve Kondik
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. Add a call to TimeZone.inDaylightTime to get correct
time zone.

Change-Id: I44565bc8df48e81370ea3bfbb099a6a5675e343d
parent 34f79737

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

+5 −3
Original line number Diff line number Diff line
@@ -771,9 +771,11 @@ 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.getRawOffset();

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

                    gmtOffset += zone.getDSTSavings();

                }

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

            	scheduleDateChangedEvent();

            }

        }