diff --git a/api/cm_current.txt b/api/cm_current.txt
index 0e3e14b..9f02989 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -809,7 +809,6 @@ package cyanogenmod.providers {
field public static final java.lang.String CAMERA_LAUNCH = "camera_launch";
field public static final java.lang.String CAMERA_SLEEP_ON_RELEASE = "camera_sleep_on_release";
field public static final java.lang.String CAMERA_WAKE_SCREEN = "camera_wake_screen";
- field public static final java.lang.String CONNECTED_LINE_IDENTIFICATION = "connected_line_identification";
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String DIALER_OPENCNAM_ACCOUNT_SID = "dialer_opencnam_account_sid";
field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";
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 @@
com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet
-
- true
-
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
diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/src/java/cyanogenmod/providers/CMSettings.java
index 830299f..f0f0f6c 100644
--- a/src/java/cyanogenmod/providers/CMSettings.java
+++ b/src/java/cyanogenmod/providers/CMSettings.java
@@ -1760,16 +1760,6 @@ public final class CMSettings {
public static final Validator TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR =
sBooleanValidator;
- /**
- * Whether or not to respect the network presentation indicator of outgoing calls
- */
- public static final String CONNECTED_LINE_IDENTIFICATION =
- "connected_line_identification";
-
- /** @hide */
- public static final Validator CONNECTED_LINE_IDENTIFICATION_VALIDATOR =
- sBooleanValidator;
-
/**
* I can haz more bukkits
* @hide
@@ -2025,8 +2015,6 @@ public final class CMSettings {
VALIDATORS.put(ZEN_PRIORITY_ALLOW_LIGHTS, ZEN_PRIORITY_ALLOW_LIGHTS_VALIDATOR);
VALIDATORS.put(TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK,
TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR);
- VALIDATORS.put(CONNECTED_LINE_IDENTIFICATION,
- CONNECTED_LINE_IDENTIFICATION_VALIDATOR);
VALIDATORS.put(__MAGICAL_TEST_PASSING_ENABLER,
__MAGICAL_TEST_PASSING_ENABLER_VALIDATOR);
};
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index 0e3e14b..9f02989 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -809,7 +809,6 @@ package cyanogenmod.providers {
field public static final java.lang.String CAMERA_LAUNCH = "camera_launch";
field public static final java.lang.String CAMERA_SLEEP_ON_RELEASE = "camera_sleep_on_release";
field public static final java.lang.String CAMERA_WAKE_SCREEN = "camera_wake_screen";
- field public static final java.lang.String CONNECTED_LINE_IDENTIFICATION = "connected_line_identification";
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String DIALER_OPENCNAM_ACCOUNT_SID = "dialer_opencnam_account_sid";
field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";