diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-22 15:00:40 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2015-06-22 15:20:57 -0700 |
| commit | 71f0747e4126c41aa30a5ffc431b8c70b3458445 (patch) | |
| tree | 4bd98f1611ecf9793a0b78bbd6fafd3467be3d10 /src | |
| parent | 876a6a921e532b6c1ca653e4c52c1819a75ff3be (diff) | |
| download | packages_providers_ContactsProvider-71f0747e4126c41aa30a5ffc431b8c70b3458445.zip packages_providers_ContactsProvider-71f0747e4126c41aa30a5ffc431b8c70b3458445.tar.gz packages_providers_ContactsProvider-71f0747e4126c41aa30a5ffc431b8c70b3458445.tar.bz2 | |
Fix upgrade steps
We accidentally reused version 1010.
Bug 21933746
Bug 21928867
Change-Id: Ic1aa05d264105f5794b2079ec1a8e5f9b54ed6e5
Diffstat (limited to 'src')
| -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 d20358a..fc81fa5 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) { |