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

Commit b22462c5 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev

parents 2ee054b4 4fea0923

core/java/android/provider/Settings.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -6600,6 +6600,15 @@ public final class Settings { 
         */

         */

        public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";

        public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";





        /**

         * Whether user can enable/disable LTE as a preferred network. A carrier might control

         * this via gservices, OMA-DM, carrier app, etc.

         * <p>

         * Type: int (0 for false, 1 for true)

         * @hide

         */

        public static final String LTE_SERVICE_FORCED = "lte_service_forced";



        /**

        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.

         * keys and easy to update.

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -2620,8 +2620,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            // 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;

            type = SystemProperties.getInt("ro.telephony.default_network",

            type = RILConstants.PREFERRED_NETWORK_MODE;

                        RILConstants.PREFERRED_NETWORK_MODE);

            loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);

            loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);





            // Set the preferred cdma subscription source to target desired value or default

            // Set the preferred cdma subscription source to target desired value or default

telephony/java/com/android/internal/telephony/RILConstants.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ package com.android.internal.telephony; 
 * Also they should all probably be static final.

 * Also they should all probably be static final.

 */

 */





import android.os.SystemProperties;



/**

/**

 * {@hide}

 * {@hide}

 */

 */
@@ -86,7 +88,8 @@ public interface RILConstants { 
    int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */

    int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */

    int NETWORK_MODE_LTE_ONLY       = 11; /* LTE Only mode. */

    int NETWORK_MODE_LTE_ONLY       = 11; /* LTE Only mode. */

    int NETWORK_MODE_LTE_WCDMA      = 12; /* LTE/WCDMA */

    int NETWORK_MODE_LTE_WCDMA      = 12; /* LTE/WCDMA */

    int PREFERRED_NETWORK_MODE      = NETWORK_MODE_WCDMA_PREF;

    int PREFERRED_NETWORK_MODE      = SystemProperties.getInt("ro.telephony.default_network",

            NETWORK_MODE_WCDMA_PREF);





    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;

    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;

    int CDMA_CELL_BROADCAST_SMS_ENABLED  = 0;

    int CDMA_CELL_BROADCAST_SMS_ENABLED  = 0;