diff options
author | Conley Owens <cco3@android.com> | 2011-06-20 11:01:41 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-06-20 11:01:41 -0700 |
commit | bf5adfa5e558827fbb4771720433887bb3cbaefd (patch) | |
tree | 069df23363acfa6e67bacdcb8269bbf8b754c4ed | |
parent | e3b05d09163257b888c86f2a560e10c48f4cf029 (diff) | |
parent | c84cc4f183cb18f299bed237235fa64e013d0fca (diff) | |
download | base-bf5adfa5e558827fbb4771720433887bb3cbaefd.tar.gz |
Merge "Check if we are in daylight time when calculating timezone"android-sdk-tools_r12
-rw-r--r-- | services/java/com/android/server/AlarmManagerService.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/java/com/android/server/AlarmManagerService.java index 4931cc7bd98d..cf3ecdcfc38c 100644 --- a/services/java/com/android/server/AlarmManagerService.java +++ b/services/java/com/android/server/AlarmManagerService.java @@ -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(); } } |