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

Commit f4440243 authored by Grace Chen's avatar Grace Chen Committed by android-build-merger
Browse files

Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac5 

am: d09386a6

Change-Id: I9ae15ef2270314c9fbfcac110c97857b229e4804
parents 0d6ffbad d09386a6

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

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import android.util.Log; 


import com.android.ims.ImsConfig;

import com.android.internal.content.PackageHelper;

import com.android.internal.telephony.Phone;

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;
@@ -2617,9 +2617,9 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);



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

            // value defined in CdmaSubscriptionSourceManager

            // value defined in Phone

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

                        CdmaSubscriptionSourceManager.PREFERRED_CDMA_SUBSCRIPTION);

                        Phone.PREFERRED_CDMA_SUBSCRIPTION);

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



            loadIntegerSetting(stmt, Settings.Global.LOW_BATTERY_SOUND_TIMEOUT,