Merge "Check if we are in daylight time when calculating timezone"
This commit is contained in:
@ -281,10 +281,7 @@ class AlarmManagerService extends IAlarmManager.Stub {
|
|||||||
|
|
||||||
// Update the kernel timezone information
|
// Update the kernel timezone information
|
||||||
// Kernel tracks time offsets as 'minutes west of GMT'
|
// Kernel tracks time offsets as 'minutes west of GMT'
|
||||||
int gmtOffset = zone.getRawOffset();
|
int gmtOffset = zone.getOffset(System.currentTimeMillis());
|
||||||
if (zone.inDaylightTime(new Date(System.currentTimeMillis()))) {
|
|
||||||
gmtOffset += zone.getDSTSavings();
|
|
||||||
}
|
|
||||||
setKernelTimezone(mDescriptor, -(gmtOffset / 60000));
|
setKernelTimezone(mDescriptor, -(gmtOffset / 60000));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -784,9 +781,8 @@ class AlarmManagerService extends IAlarmManager.Stub {
|
|||||||
// based off of the current Zone gmt offset + userspace tracked
|
// based off of the current Zone gmt offset + userspace tracked
|
||||||
// daylight savings information.
|
// daylight savings information.
|
||||||
TimeZone zone = TimeZone.getTimeZone(SystemProperties.get(TIMEZONE_PROPERTY));
|
TimeZone zone = TimeZone.getTimeZone(SystemProperties.get(TIMEZONE_PROPERTY));
|
||||||
int gmtOffset = (zone.getRawOffset() + zone.getDSTSavings()) / 60000;
|
int gmtOffset = zone.getOffset(System.currentTimeMillis());
|
||||||
|
setKernelTimezone(mDescriptor, -(gmtOffset / 60000));
|
||||||
setKernelTimezone(mDescriptor, -(gmtOffset));
|
|
||||||
scheduleDateChangedEvent();
|
scheduleDateChangedEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user