diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-22 22:34:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 22:34:32 +0000 |
| commit | 839eddd7ba394dad1d14a84fda49415335961372 (patch) | |
| tree | 0d3c887504539e455f5a82d07e4423905587d38d | |
| parent | f60c193429d669a8d7ca13d431d6446b84267662 (diff) | |
| parent | 71f0747e4126c41aa30a5ffc431b8c70b3458445 (diff) | |
| download | packages_providers_ContactsProvider-839eddd7ba394dad1d14a84fda49415335961372.tar.gz packages_providers_ContactsProvider-839eddd7ba394dad1d14a84fda49415335961372.tar.bz2 packages_providers_ContactsProvider-839eddd7ba394dad1d14a84fda49415335961372.zip | |
am 71f0747e: Fix upgrade steps
* commit '71f0747e4126c41aa30a5ffc431b8c70b3458445':
Fix upgrade steps
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index d20358ae..fc81fa5b 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -121,7 +121,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { * 1000-1099 M * </pre> */ - static final int DATABASE_VERSION = 1010; + static final int DATABASE_VERSION = 1011; public interface Tables { public static final String CONTACTS = "contacts"; @@ -2895,9 +2895,13 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 1010; } - if (oldVersion < 1010) { + if (oldVersion < 1011) { + // There was a merge error, so do step1010 again, and also re-crete views. + // upgradeToVersion1010() is safe to re-run. + upgradeToVersion1010(db); + rebuildSqliteStats = true; upgradeViewsAndTriggers = true; - oldVersion = 1010; + oldVersion = 1011; } if (upgradeViewsAndTriggers) { |