summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-05-19 18:05:49 -0700
committerJay Shrauner <shrauner@google.com>2014-05-19 21:23:22 -0700
commit17f2d60a0fa76dec836b7bda60a029fe5c40356a (patch)
tree648077da64fd8cdc8b308cc511f47a6843be0ddf /src
parentbca17cbe4fe19e9af8e51598681028725cb12cf2 (diff)
downloadpackages_providers_ContactsProvider-17f2d60a0fa76dec836b7bda60a029fe5c40356a.zip
packages_providers_ContactsProvider-17f2d60a0fa76dec836b7bda60a029fe5c40356a.tar.gz
packages_providers_ContactsProvider-17f2d60a0fa76dec836b7bda60a029fe5c40356a.tar.bz2
Fix acore crash in DB upgrade
Remove unused getProperty() call in upgradeLocaledata() that created a recursive call to getDatabase() Bug:15091283 Change-Id: I372763aaff3daf47c3b191c3dc669d26a4b25a62
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/contacts/ContactsDatabaseHelper.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 265846c..29c6d2c 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -3283,7 +3283,6 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
}
private void upgradeLocaleData(SQLiteDatabase db, boolean rebuildSqliteStats) {
- final String dbLocale = getProperty(DbProperties.LOCALE, "");
final LocaleSet locales = LocaleSet.getDefault();
Log.i(TAG, "Upgrading locale data for " + locales
+ " (ICU v" + ICU.getIcuVersion() + ")");