ADHOC/replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Allow to ignore presentation indicator of outgoing calls [1/3]"

Browse Source 
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 3a590c3057.

Change-Id: I03cc2796e84e602933e7132f9181a5822c7f327c
This commit is contained in:
Adnan Begovic 2016-03-10 09:50:28 -08:00 committed by Gerrit Code Review
parent f8d4978149
commit 2f2d432495
6 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/cm_current.txt
View File

@ -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_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_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 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 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_ACCOUNT_SID = "dialer_opencnam_account_sid";
field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token"; field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";

3
packages/CMSettingsProvider/res/values/defaults.xml
View File

@ -107,7 +107,4 @@
<!-- Default values for protected component managers --> <!-- Default values for protected component managers -->
<string name="def_protected_component_managers" translatable="false">com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet</string> <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> </resources>

3
packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
View File

@ -299,9 +299,6 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
loadIntegerSetting(stmt, CMSettings.System.STATUS_BAR_BATTERY_STYLE, loadIntegerSetting(stmt, CMSettings.System.STATUS_BAR_BATTERY_STYLE,
R.integer.def_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)) { if (mContext.getResources().getBoolean(R.bool.def_notification_pulse_custom_enable)) {
loadStringSetting(stmt, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES, loadStringSetting(stmt, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES,
R.string.def_notification_pulse_custom_value); R.string.def_notification_pulse_custom_value);

3
packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
View File

@ -76,9 +76,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
SYSTEM_SETTINGS_DEFAULTS.add(new Setting( SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.System.STATUS_BAR_BATTERY_STYLE, CMSettings.System.STATUS_BAR_BATTERY_STYLE,
"R.integer.def_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 //SECURE

12
src/java/cyanogenmod/providers/CMSettings.java
View File

@ -1760,16 +1760,6 @@ public final class CMSettings {
public static final Validator TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR = public static final Validator TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR =
sBooleanValidator; 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 * I can haz more bukkits
* @hide * @hide
@ -2025,8 +2015,6 @@ public final class CMSettings {
VALIDATORS.put(ZEN_PRIORITY_ALLOW_LIGHTS, ZEN_PRIORITY_ALLOW_LIGHTS_VALIDATOR); VALIDATORS.put(ZEN_PRIORITY_ALLOW_LIGHTS, ZEN_PRIORITY_ALLOW_LIGHTS_VALIDATOR);
VALIDATORS.put(TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK, VALIDATORS.put(TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK,
TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR); TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK_VALIDATOR);
VALIDATORS.put(CONNECTED_LINE_IDENTIFICATION,
CONNECTED_LINE_IDENTIFICATION_VALIDATOR);
VALIDATORS.put(__MAGICAL_TEST_PASSING_ENABLER, VALIDATORS.put(__MAGICAL_TEST_PASSING_ENABLER,
__MAGICAL_TEST_PASSING_ENABLER_VALIDATOR); __MAGICAL_TEST_PASSING_ENABLER_VALIDATOR);
}; };

1
system-api/cm_system-current.txt
View File

@ -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_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_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 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 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_ACCOUNT_SID = "dialer_opencnam_account_sid";
field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token"; field public static final java.lang.String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";