From 6ad1c5ef3c44f3619b987c1af2ca6c5a876b8282 Mon Sep 17 00:00:00 2001 From: Grace Chen Date: Tue, 13 Jun 2017 16:07:45 -0700 Subject: [PATCH] Default CDMA subscription source to RUIM/SIM Operators read CDMA subscription from RUIM/SIM now thus change the default hardcoded preference everywhere. Add code clean-up to make the default come from a single source, the Phone interface. Additional rework proposed in http://b/62299272, but this corrects immediate issue where CDMA SSM was defaulting to NV instead of RUIM /SIM and caused CSIM subscription to not load and 'no sim' symptom for many users. Bug: 62143087 Test: None Change-Id: I32b1f1e40c736a566df824218a6565de851ce161 --- .../src/com/android/providers/settings/DatabaseHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b777d412ca6c4..06d00be8aee8d 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 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,