Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev

Browse Source
This commit is contained in:
Junda Liu
2015-06-16 23:11:30 +00:00
committed by Android (Google) Code Review
parent e6ba94ce02 297da6ffb9
commit a11ffa6436
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -26564,7 +26564,6 @@ package android.provider {
field public static final java.lang.String DEBUG_APP = "debug_app";
field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
field public static final java.lang.String HIDE_CARRIER_NETWORK_SETTINGS = "hide_carrier_network_settings";
field public static final java.lang.String HTTP_PROXY = "http_proxy";
field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
field public static final java.lang.String MODE_RINGER = "mode_ringer";

1
api/system-current.txt
View File

@@ -28600,7 +28600,6 @@ package android.provider {
field public static final java.lang.String DEBUG_APP = "debug_app";
field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
field public static final java.lang.String HIDE_CARRIER_NETWORK_SETTINGS = "hide_carrier_network_settings";
field public static final java.lang.String HTTP_PROXY = "http_proxy";
field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
field public static final java.lang.String MODE_RINGER = "mode_ringer";

7
core/java/android/provider/Settings.java
View File

@@ -7231,13 +7231,6 @@ public final class Settings {
public static final String PREFERRED_NETWORK_MODE =
"preferred_network_mode";
/**
* Setting to 1 will hide carrier network settings.
* Default is 0.
*/
public static final String HIDE_CARRIER_NETWORK_SETTINGS =
"hide_carrier_network_settings";
/**
* Name of an application package to be debugged.
*/

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -2682,9 +2682,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
// Set default cdma call auto retry
loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);
// Set default simplified carrier network settings to 0
loadSetting(stmt, Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0);
// Set the preferred network mode to target desired value or Default
// value defined in RILConstants
int type;