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

Commit b4d485c1 authored by Naveen Kalla's avatar Naveen Kalla
Browse files

Set subscription_mode in the database to a default value 

If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
parent c67b2ed5

core/java/android/provider/Settings.java

+0 −9
Original line number Diff line number Diff line
@@ -2760,7 +2760,6 @@ public final class Settings { 
            MOVED_TO_GLOBAL.add(Settings.Global.SET_GLOBAL_HTTP_PROXY);

            MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_DNS_SERVER);

            MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE);

            MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_CDMA_SUBSCRIPTION);

        }



        /** @hide */
@@ -5333,14 +5332,6 @@ public final class Settings { 
        public static final String PREFERRED_NETWORK_MODE =

                "preferred_network_mode";



        /**

         * The cdma subscription 0 = Subscription from RUIM, when available

         *                       1 = Subscription from NV

         * @hide

         */

        public static final String PREFERRED_CDMA_SUBSCRIPTION =

                "preferred_cdma_subscription";



        /**

         * Name of an application package to be debugged.

         */

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

+8 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.internal.content.PackageHelper; 
import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.util.XmlUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;
@@ -1429,7 +1430,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                    };

                    String[] secureToGlobal = {

                            Settings.Global.PREFERRED_NETWORK_MODE,

                            Settings.Global.PREFERRED_CDMA_SUBSCRIPTION,

                            Settings.Global.CDMA_SUBSCRIPTION_MODE,

                    };



                    moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, systemToGlobal, true);
@@ -2246,6 +2247,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                        RILConstants.PREFERRED_NETWORK_MODE);

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



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

            // value defined in CdmaSubscriptionSourceManager

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

                        CdmaSubscriptionSourceManager.PREFERRED_CDMA_SUBSCRIPTION);

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



            // --- New global settings start here

        } finally {

            if (stmt != null) stmt.close();