diff options
| author | belgin <belginstirbu@hotmail.com> | 2020-11-24 01:45:45 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-25 11:35:10 +0100 |
| commit | 16889db83588f6658a40e99db142f3356220ed94 (patch) | |
| tree | 0c64d5e3261c73d93c2f1420d2d5fb9b99d20f00 /packages | |
| parent | 2d8ae47d9919f83cdf7244c3eeb34f919d83a33d (diff) | |
| download | vendor_cmsdk-6ff0c619ff50ec82c771cd43d571bc52855099b0.tar.gz vendor_cmsdk-6ff0c619ff50ec82c771cd43d571bc52855099b0.tar.bz2 vendor_cmsdk-6ff0c619ff50ec82c771cd43d571bc52855099b0.zip | |
Remove analytics supportHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004replicant-6.0
Signed-off-by: belgin <belginstirbu@hotmail.com>
Acked-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'packages')
4 files changed, 1 insertions, 14 deletions
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml index 0e14ceb..68f48a3 100644 --- a/packages/CMSettingsProvider/res/values/defaults.xml +++ b/packages/CMSettingsProvider/res/values/defaults.xml @@ -48,9 +48,6 @@ Comma-delimited, quick settings tiles. See QSConstants.java for a list of all available tiles <string name="def_qs_tiles">wifi,bt,cell,airplane,rotation,flashlight,location,cast,hotspot,live_display</string> --> - <!-- Default for CMSettings.Secure.STATS_COLLECTION --> - <bool name="def_stats_collection">false</bool> - <!-- Default for CMSettings.System.STATUS_BAR_BATTERY_STYLE * 0: Display the battery as icon in portrait mode * 2: Display the battery as a circle 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; } diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java index 2ea0bf8..d2ed193 100644 --- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java +++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java @@ -93,9 +93,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase { CMSettings.Secure.QS_USE_MAIN_TILES, "R.bool.def_sysui_qs_main_tiles")); SECURE_SETTINGS_DEFAULTS.add(new Setting( - CMSettings.Secure.STATS_COLLECTION, - "R.bool.def_stats_collection")); - SECURE_SETTINGS_DEFAULTS.add(new Setting( CMSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED, "R.bool.def_lockscreen_visualizer")); SECURE_SETTINGS_DEFAULTS.add(new Setting( |