aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShareef Ali <shareefalis@cyanogenmod.org>2014-02-13 00:30:14 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-02-13 00:30:14 +0000
commitf066f84179fe10770e3f9ce435687ee7c85e6692 (patch)
tree6e05aff9ba534d2bf8a14eb47a3e690387111108
parent5c0b01152278bedc47d2119ade705e9bb15c3cb9 (diff)
parentac0890fe7d97a7b821dc2faf13235065d9e5c707 (diff)
downloadandroid_frameworks_opt_telephony-f066f84179fe10770e3f9ce435687ee7c85e6692.tar.gz
android_frameworks_opt_telephony-f066f84179fe10770e3f9ce435687ee7c85e6692.tar.bz2
android_frameworks_opt_telephony-f066f84179fe10770e3f9ce435687ee7c85e6692.zip
Merge "DCTracker: if cdma sim is not avaliable, load from predefined property from build.prop" into cm-11.0
-rw-r--r--src/java/com/android/internal/telephony/dataconnection/DcTracker.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index b635f23fb..8d03fb8e4 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -2025,7 +2025,11 @@ public final class DcTracker extends DcTrackerBase {
private void createAllApnList() {
mAllApnSettings = new ArrayList<ApnSetting>();
IccRecords r = mIccRecords.get();
- String operator = (r != null) ? r.getOperatorNumeric() : "";
+ String homeOperator = "";
+ if (isNvSubscription()){
+ homeOperator = SystemProperties.get("ro.cdma.home.operator.numeric");
+ }
+ String operator = (r != null) ? r.getOperatorNumeric() : homeOperator;
if (operator != null) {
String selection = "numeric = '" + operator + "'";
// query only enabled apn.
@@ -2110,7 +2114,11 @@ public final class DcTracker extends DcTrackerBase {
}
IccRecords r = mIccRecords.get();
- String operator = (r != null) ? r.getOperatorNumeric() : "";
+ String homeOperator = "";
+ if (isNvSubscription()){
+ homeOperator = SystemProperties.get("ro.cdma.home.operator.numeric");
+ }
+ String operator = (r != null) ? r.getOperatorNumeric() : homeOperator;
// This is a workaround for a bug (7305641) where we don't failover to other
// suitable APNs if our preferred APN fails. On prepaid ATT sims we need to