drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 523db46f: Merge "Set subscription_mode in the database to a default value"

Browse Source 
* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value
This commit is contained in:
Wink Saville
2013-08-05 17:20:13 -07:00
committed by Android Git Automerger
parent 3a5e2013a1 523db46f69
commit 9fe49fc56e
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

@ -2761,7 +2761,6 @@ public final class Settings {
MOVED_TO_GLOBAL.add(Settings.Global.SET_GLOBAL_HTTP_PROXY); 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.DEFAULT_DNS_SERVER);
MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE); MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE);
MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_CDMA_SUBSCRIPTION);
} }
/** @hide */ /** @hide */
@ -5334,14 +5333,6 @@ public final class Settings {
public static final String PREFERRED_NETWORK_MODE = public static final String PREFERRED_NETWORK_MODE =
"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. * Name of an application package to be debugged.
*/ */

9
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@ -47,6 +47,7 @@ import com.android.internal.content.PackageHelper;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
import com.android.internal.util.XmlUtils; import com.android.internal.util.XmlUtils;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView; import com.android.internal.widget.LockPatternView;
@ -1429,7 +1430,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}; };
String[] secureToGlobal = { String[] secureToGlobal = {
Settings.Global.PREFERRED_NETWORK_MODE, Settings.Global.PREFERRED_NETWORK_MODE,
Settings.Global.PREFERRED_CDMA_SUBSCRIPTION, Settings.Global.CDMA_SUBSCRIPTION_MODE,
}; };
moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, systemToGlobal, true); moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, systemToGlobal, true);
@ -2246,6 +2247,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
RILConstants.PREFERRED_NETWORK_MODE); RILConstants.PREFERRED_NETWORK_MODE);
loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type); 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 // --- New global settings start here
} finally { } finally {
if (stmt != null) stmt.close(); if (stmt != null) stmt.close();