Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11ffa64 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

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

parents e6ba94ce 297da6ff

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 DEBUG_APP = "debug_app";

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    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 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 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 deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

    field public static final java.lang.String MODE_RINGER = "mode_ringer";

    field public static final java.lang.String MODE_RINGER = "mode_ringer";

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 DEBUG_APP = "debug_app";

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    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 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 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 deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

    field public static final java.lang.String MODE_RINGER = "mode_ringer";

    field public static final java.lang.String MODE_RINGER = "mode_ringer";

core/java/android/provider/Settings.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -7231,13 +7231,6 @@ public final class Settings { 
        public static final String PREFERRED_NETWORK_MODE =

        public static final String PREFERRED_NETWORK_MODE =

                "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.

         * Name of an application package to be debugged.

         */

         */

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -2682,9 +2682,6 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            // Set default cdma call auto retry

            // Set default cdma call auto retry

            loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);

            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

            // Set the preferred network mode to target desired value or Default

            // value defined in RILConstants

            // value defined in RILConstants

            int type;

            int type;