commit a345ccbf785c5f81c4a642e8d70d572b3d6ae7a7
author Yorke Lee <yorkelee@google.com> Wed Sep 04 14:08:14 2013 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 04 16:02:37 2013 -0700
tree 8b099564a9e6dee98d6bb169cab58d68bee1b6e2
parent bc6a8d7eaf4ca46b215c0aa4dbc3b39cecfee5fc

Don't wipe subclass helper's tables in our upgrade steps

Bug: 10618836
Change-Id: I086d082f69b85bfe5789cf4c20dd9f9da30cee87

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;
         }