diff options
| author | Junda Liu <junda@google.com> | 2015-06-16 23:11:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 23:11:32 +0000 |
| commit | a11ffa64366e39899bcda7448e5b5ffe727bea48 (patch) | |
| tree | bfe96f9a7e7a3b300de3f1e5975883a4eee50584 | |
| parent | e6ba94ce022a60b5225ee54cf2cc710633441d87 (diff) | |
| parent | 297da6ffb996460cce8efcf8fa920ea54e99731d (diff) | |
| download | frameworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.zip frameworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.tar.gz frameworks_base-a11ffa64366e39899bcda7448e5b5ffe727bea48.tar.bz2 | |
Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/api/current.txt b/api/current.txt index 5126123..2094c7c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/system-current.txt b/api/system-current.txt index d3823fc..9386c50 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index dfd72c2..3e9c9de 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7232,13 +7232,6 @@ public final class Settings { "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. */ public static final String DEBUG_APP = "debug_app"; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 7bf2223..5a14967 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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; |