diff options
| author | 2009-07-15 16:58:11 -0700 | |
|---|---|---|
| committer | 2009-07-15 16:58:11 -0700 | |
| commit | 8e0fb366fcc9897291f68245b2cb4e86f5161ded (patch) | |
| tree | 98481df56214d00994482c97c496f60511bdc85a | |
| parent | 82b283a9bf8e3508e1b5c6d4b6b8cae04597b83c (diff) | |
| parent | ae49180f280fdda509103a403ec909fbebdf3971 (diff) | |
Merge change 7359 into donut
* changes:
Minor tweak to CDMA_SUBSCRIPTION.
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 11 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/RuimRecords.java | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index af8e202c3f5a..abb4a433bfeb 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -665,8 +665,15 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { if (cdmaSubscription != null && cdmaSubscription.length >= 4) { 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]; } else { diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java index c7e61da3f8d7..4d888f676b46 100644 --- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java +++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java @@ -55,8 +55,6 @@ public final class RuimRecords extends IccRecords { private String mImsi; private String mMyMobileNumber; - private String mSid; - private String mNid; private String mMin2Min1; private String mPrlVersion; @@ -242,8 +240,6 @@ public final class RuimRecords extends IccRecords { m_ota_commited = false; } mMyMobileNumber = localTemp[0]; - mSid = localTemp[1]; - mNid = localTemp[2]; mMin2Min1 = localTemp[3]; mPrlVersion = localTemp[4]; |