aboutsummaryrefslogtreecommitdiffstats
path: root/packages/CMSettingsProvider/src/org/cyanogenmod
diff options
context:
space:
mode:
Diffstat (limited to 'packages/CMSettingsProvider/src/org/cyanogenmod')
-rw-r--r--packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java3
-rw-r--r--packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java6
2 files changed, 1 insertions, 8 deletions
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index 1242c1a..4ccd5f1 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -356,9 +356,6 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
loadBooleanSetting(stmt, CMSettings.Secure.QS_USE_MAIN_TILES,
R.bool.def_sysui_qs_main_tiles);
- loadBooleanSetting(stmt, CMSettings.Secure.STATS_COLLECTION,
- R.bool.def_stats_collection);
-
loadBooleanSetting(stmt, CMSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED,
R.bool.def_lockscreen_visualizer);
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
index a4630df..c867646 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
@@ -208,12 +208,8 @@ public class CMSettingsProvider extends ContentProvider {
else if (tableName.equals(CMDatabaseHelper.CMTableNames.TABLE_SECURE)) {
settingsValue = Settings.Secure.getStringForUser(contentResolver, settingsKey,
userId);
- if (settingsValue != null && settingsKey.equals(CMSettings.Secure.STATS_COLLECTION)
- && CMSettings.Secure.getStringForUser(contentResolver, settingsKey, userId)
+ if (settingsValue != null && CMSettings.Secure.getStringForUser(contentResolver, settingsKey, userId)
!= null) {
- // incorrect migration from YOG4P -> YOG7D failed to remove
- // Settings.Secure.STATS_COLLECTION after migration; so it may exist in both
- // providers; so if it exists in the new database, prefer it.
continue;
}