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

am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair

Browse Source 
Merge commit '53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp

* commit '53e9c126f5fc39459554f0290a2c863f645d397a':
  AlarmManagerService: Fix daylight savings time offset computation
This commit is contained in:
Mike Lockwood
2009-11-20 13:36:14 -08:00
committed by Android Git Automerger
parent b11f8a216f 53e9c126f5
commit 589f8d7d41
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
@@ -260,8 +261,11 @@ 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() + zone.getDSTSavings()) / 60000; int gmtOffset = zone.getRawOffset();
setKernelTimezone(mDescriptor, -(gmtOffset)); if (zone.inDaylightTime(new Date(System.currentTimeMillis()))) {
gmtOffset += zone.getDSTSavings();
}
setKernelTimezone(mDescriptor, -(gmtOffset / 60000));
} }
TimeZone.setDefault(null); TimeZone.setDefault(null);