From 830f982e42eafaeb95b72fef9830167d39b025dc Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 10 Sep 2010 16:05:21 -0700 Subject: [PATCH] Fix bug where instances didn't regen. Do not merge Instances table wasn't regenerating when the user switched to auto. Change-Id: I43a40699f6fa99c3c90f3005ce464d50ef56b45a --- src/com/android/providers/calendar/CalendarProvider2.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java index 6a2ee53a..871050a1 100644 --- a/src/com/android/providers/calendar/CalendarProvider2.java +++ b/src/com/android/providers/calendar/CalendarProvider2.java @@ -17,6 +17,8 @@ package com.android.providers.calendar; +import com.google.common.annotations.VisibleForTesting; + import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.OnAccountsUpdateListener; @@ -55,7 +57,6 @@ import android.util.Log; import android.util.TimeFormatException; import android.util.TimeUtils; -import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.Arrays; @@ -2866,6 +2867,9 @@ protected int updateInTransaction(Uri uri, ContentValues values, String selectio else if (value.equals(CalendarCache.TIMEZONE_TYPE_AUTO)) { String localTimezone = TimeZone.getDefault().getID(); mCalendarCache.writeTimezoneInstances(localTimezone); + if (!timezoneInstancesBeforeUpdate.equals(localTimezone)) { + regenerateInstancesTable(); + } } } }