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

Commit a1ce6551 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I69324a33 into eclair

* changes:
  AlarmManagerService: Fix daylight savings time offset computation
parents 055b4392 1f7b4134
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -260,8 +261,11 @@ class AlarmManagerService extends IAlarmManager.Stub {
            
            // Update the kernel timezone information
            // Kernel tracks time offsets as 'minutes west of GMT'
            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));
        }

        TimeZone.setDefault(null);