commit 38c3cef43724e8a679f332bc0ab07c1686ea82c1
author Yorke Lee <yorkelee@google.com> Wed Sep 04 15:02:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 15:02:17 2013 -0700
tree 5b5d4d176f0aa385aab3299898f466287c98d24a
parent 09b96c1d5db3e9494598020da60551310c30dc85
parent f1f0df7120069399417a64f03cd4d38de05446bc

am f1f0df71: Merge "Don\'t wipe subclass helper\'s tables in our upgrade steps" into klp-dev

* commit 'f1f0df7120069399417a64f03cd4d38de05446bc':
  Don't wipe subclass helper's tables in our upgrade steps

src/com/android/dialer/database/DialerDatabaseHelper.java

diff --git a/src/com/android/dialer/database/DialerDatabaseHelper.java b/src/com/android/dialer/database/DialerDatabaseHelper.java
index 4bf8eda..e9d7735 100644
--- a/src/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/src/com/android/dialer/database/DialerDatabaseHelper.java
@@ -337,6 +337,10 @@
      */
     @Override
     public void onCreate(SQLiteDatabase db) {
+        setupTables(db);
+    }
+
+    private void setupTables(SQLiteDatabase db) {
         dropTables(db);
         db.execSQL("CREATE TABLE " + Tables.SMARTDIAL_TABLE + " (" +
                 SmartDialDbColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
@@ -390,7 +394,7 @@
         }
 
         if (oldVersion < 4) {
-            onCreate(db);
+            setupTables(db);
             return;
         }