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

Commit 53e9c126 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am a1ce6551: Merge change I69324a33 into eclair 

Merge commit 'a1ce6551' into eclair-mr2

* commit 'a1ce6551':
  AlarmManagerService: Fix daylight savings time offset computation
parents d47fad27 a1ce6551

services/java/com/android/server/AlarmManagerService.java

+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);