diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-03-10 09:50:28 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-10 11:46:03 -0800 |
| commit | 2f2d432495704d0bd03b1406a7f93f9044682a73 (patch) | |
| tree | 8edc653c2885dfe83d90746759770e60d4c61a04 /packages/CMSettingsProvider | |
| parent | f8d497814957e7171ecca589fa0dd7d47c203a0d (diff) | |
| download | vendor_cmsdk-2f2d432495704d0bd03b1406a7f93f9044682a73.zip vendor_cmsdk-2f2d432495704d0bd03b1406a7f93f9044682a73.tar.gz vendor_cmsdk-2f2d432495704d0bd03b1406a7f93f9044682a73.tar.bz2 | |
Revert "Allow to ignore presentation indicator of outgoing calls [1/3]"
This adds public cmsdk symbols to the bootclasspath. :(
2) testBootClassPathIsClean(org.cyanogenmod.tests.versioning.unit.ClassPathTest)
java.lang.AssertionError: Jar file /system/framework/telephony-common.jar should not have cyanogenmod.alarmclock.ClockContract$AlarmsColumns !
This reverts commit 3a590c305737a8533f40235fc7dbdcfaee30bdcb.
Change-Id: I03cc2796e84e602933e7132f9181a5822c7f327c
Diffstat (limited to 'packages/CMSettingsProvider')
3 files changed, 0 insertions, 9 deletions
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml index 4a082cb..5d590ad 100644 --- a/packages/CMSettingsProvider/res/values/defaults.xml +++ b/packages/CMSettingsProvider/res/values/defaults.xml @@ -107,7 +107,4 @@ <!-- Default values for protected component managers --> <string name="def_protected_component_managers" translatable="false">com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet</string> - <!-- Default value for COLP --> - <bool name="def_connected_line_identification">true</bool> - </resources> diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java index ee064c0..98064af 100644 --- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java +++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java @@ -299,9 +299,6 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{ loadIntegerSetting(stmt, CMSettings.System.STATUS_BAR_BATTERY_STYLE, R.integer.def_battery_style); - loadBooleanSetting(stmt, CMSettings.System.CONNECTED_LINE_IDENTIFICATION, - R.bool.def_connected_line_identification); - if (mContext.getResources().getBoolean(R.bool.def_notification_pulse_custom_enable)) { loadStringSetting(stmt, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES, R.string.def_notification_pulse_custom_value); 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 fcbe601..a2c4269 100644 --- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java +++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java @@ -76,9 +76,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase { SYSTEM_SETTINGS_DEFAULTS.add(new Setting( CMSettings.System.STATUS_BAR_BATTERY_STYLE, "R.integer.def_battery_style")); - SYSTEM_SETTINGS_DEFAULTS.add(new Setting( - CMSettings.System.CONNECTED_LINE_IDENTIFICATION, - "R.bool.def_connected_line_identification")); } //SECURE |