Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
  Check if we are in daylight time when calculating timezone
This commit is contained in:
Conley Owens
2011-06-20 13:04:45 -07:00
committed by Android Git Automerger
parent ff3ead5072 bf5adfa5e5
commit c1b62e3ba9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/AlarmManagerService.java
View File

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