Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyoandroid-cts-2.2_r8froyo

1 files changed, 16 insertions, 2 deletions

diff --git a/src/com/android/providers/calendar/CalendarDatabaseHelper.java b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
index b38831b..74da09c 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -58,7 +58,7 @@ import java.net.URLDecoder;
 
     // Note: if you update the version number, you must also update the code
     // in upgradeDatabase() to modify the database (gracefully, if possible).
-    static final int DATABASE_VERSION = 69;
+    static final int DATABASE_VERSION = 70;
 
     private static final int PRE_FROYO_SYNC_STATE_VERSION = 3;
 
@@ -428,7 +428,12 @@ import java.net.URLDecoder;
                 "value TEXT" +
                 ");");
 
-        db.execSQL("INSERT INTO CalendarCache (key, value) VALUES (" +
+        initCalendarCacheTable(db);
+    }
+
+    private void initCalendarCacheTable(SQLiteDatabase db) {
+        db.execSQL("INSERT INTO CalendarCache (_id, key, value) VALUES (" +
+                CalendarCache.KEY_TIMEZONE_DATABASE_VERSION.hashCode() + "," +
                 "'" + CalendarCache.KEY_TIMEZONE_DATABASE_VERSION + "',"  +
                 "'" + CalendarCache.DEFAULT_TIMEZONE_DATABASE_VERSION + "'" +
                 ");");
@@ -532,6 +537,10 @@ import java.net.URLDecoder;
                 upgradeToVersion69(db);
                 oldVersion = 69;
             }
+            if (oldVersion == 69) {
+                upgradeToVersion70(db);
+                oldVersion += 1;
+            }
         } catch (SQLiteException e) {
             Log.e(TAG, "onUpgrade: SQLiteException, recreating db. " + e);
             dropTables(db);
@@ -565,6 +574,11 @@ import java.net.URLDecoder;
     }
 
     @VisibleForTesting
+    void upgradeToVersion70(SQLiteDatabase db) {
+        createCalendarCacheTable(db);
+    }
+
+    @VisibleForTesting
     static void upgradeToVersion69(SQLiteDatabase db) {
         // Clean up allDay events which could be in an invalid state from an earlier version
         // Some allDay events had hour, min, sec not set to zero, which throws elsewhere. This