diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 18:37:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 18:37:37 -0700 |
| commit | d54a97a0efc5cdd8088a277b0e6787ea24711e0c (patch) | |
| tree | 10f499463c2ca09a7e056e1d592652ade524c2fc /services/java | |
| parent | 9dfa30375e66ae533e253f5287a8c8e293187e19 (diff) | |
| parent | fb1e5529724d121aa47485e7245b69965088fbb4 (diff) | |
| download | frameworks_base-d54a97a0efc5cdd8088a277b0e6787ea24711e0c.zip frameworks_base-d54a97a0efc5cdd8088a277b0e6787ea24711e0c.tar.gz frameworks_base-d54a97a0efc5cdd8088a277b0e6787ea24711e0c.tar.bz2 | |
am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp
* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
Fix time zone info in kernel is nothing after reboot
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/AlarmManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/java/com/android/server/AlarmManagerService.java index 4e2f1e3..4931cc7 100644 --- a/services/java/com/android/server/AlarmManagerService.java +++ b/services/java/com/android/server/AlarmManagerService.java @@ -124,6 +124,14 @@ class AlarmManagerService extends IAlarmManager.Stub { public AlarmManagerService(Context context) { mContext = context; mDescriptor = init(); + + // We have to set current TimeZone info to kernel + // because kernel doesn't keep this after reboot + String tz = SystemProperties.get(TIMEZONE_PROPERTY); + if (tz != null) { + setTimeZone(tz); + } + PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); |