diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | packages/SettingsProvider/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 3f8b68064e27..81e76ab3dea2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2761,7 +2761,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 */ @@ -5335,14 +5334,6 @@ public final class Settings { "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. */ public static final String DEBUG_APP = "debug_app"; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b65a9a062a19..120b28f2fcbd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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(); |