From 3d585059d7410c26a542aa5d5534c4f65898e54c Mon Sep 17 00:00:00 2001 From: Naveen Kalla Date: Wed, 3 Jul 2013 16:39:27 -0700 Subject: 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 --- core/java/android/provider/Settings.java | 9 --------- .../src/com/android/providers/settings/DatabaseHelper.java | 9 ++++++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 29ad4b30eb8..cad29bd8169 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3788,7 +3788,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 */ @@ -6517,14 +6516,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. */ diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 75f25f49732..06540e1a791 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -51,6 +51,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; @@ -1435,7 +1436,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); @@ -2317,6 +2318,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { } loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, val); + // 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(); -- cgit v1.2.3