Fix bug where instances didn't regen. Do not merge

Instances table wasn't regenerating when the user switched to auto. Change-Id: I43a40699f6fa99c3c90f3005ce464d50ef56b45a
aosp-mirror · Sep 10, 2010 · 830f982 · 830f982
1 parent 68040cf
commit 830f982
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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();
+                                }
                             }
                         }
                     }