From 2f2d432495704d0bd03b1406a7f93f9044682a73 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Thu, 10 Mar 2016 09:50:28 -0800
Subject: 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
---
 packages/CMSettingsProvider/res/values/defaults.xml                    | 3 ---
 .../src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java               | 3 ---
 .../cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java   | 3 ---
 3 files changed, 9 deletions(-)

(limited to 'packages')

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
-- 
cgit v1.1