From 297da6ffb996460cce8efcf8fa920ea54e99731d Mon Sep 17 00:00:00 2001 From: Junda Liu Date: Mon, 15 Jun 2015 15:29:08 -0700 Subject: [PATCH] Remove hide_carrier_network_settings from Settings. No longer needs this as carrier config manager handles it now. Bug: b/21347654 Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38 --- api/current.txt | 1 - api/system-current.txt | 1 - core/java/android/provider/Settings.java | 7 ------- .../src/com/android/providers/settings/DatabaseHelper.java | 3 --- 4 files changed, 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index 49e226874efd4..d7a6adb000d8a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26602,7 +26602,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 3e8b065c62ff5..88362898b2890 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28634,7 +28634,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 cac4a53ed2295..3b322658385f0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7161,13 +7161,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. */ diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 7bf2223adc9ae..5a1496701faae 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;