Merge change 7493
* changes:
resolved conflicts for merge of 8e0fb366 to master
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 92492b4e..5183108 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -401,8 +401,15 @@
String cdmaSubscription[] = (String[])ar.result;
if (cdmaSubscription != null && cdmaSubscription.length >= 5) {
mMdn = cdmaSubscription[0];
- mHomeSystemId = Integer.parseInt(cdmaSubscription[1], 16);
- mHomeNetworkId = Integer.parseInt(cdmaSubscription[2], 16);
+ // TODO: Only grabbing the first SID/NID for now.
+ if (cdmaSubscription[1] != null) {
+ String[] sid = cdmaSubscription[1].split(",");
+ mHomeSystemId = sid.length > 0 ? Integer.parseInt(sid[0]) : 0;
+ }
+ if (cdmaSubscription[2] != null) {
+ String[] nid = cdmaSubscription[2].split(",");
+ mHomeNetworkId = nid.length > 0 ? Integer.parseInt(nid[0]) : 0;
+ }
mMin = cdmaSubscription[3];
mPrlVersion = cdmaSubscription[4];
Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION MDN=" + mMdn);
diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
index 7e50cc5..f3bb5ef 100644
--- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
+++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
@@ -51,8 +51,6 @@
private String mImsi;
private String mMyMobileNumber;
- private String mSid;
- private String mNid;
private String mMin2Min1;
private String mPrlVersion;
@@ -223,8 +221,6 @@
}
mMyMobileNumber = localTemp[0];
- mSid = localTemp[1];
- mNid = localTemp[2];
mMin2Min1 = localTemp[3];
mPrlVersion = localTemp[4];