Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
am: 356d1ac545
Change-Id: I692e3d0d7eac1f94e39e85e4b244fd9974fc1108
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index b777d41..06d00be 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -45,8 +45,8 @@
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 @@
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,