From ae49180f280fdda509103a403ec909fbebdf3971 Mon Sep 17 00:00:00 2001 From: jsh Date: Tue, 14 Jul 2009 20:33:54 -0700 Subject: Minor tweak to CDMA_SUBSCRIPTION. H_SID and H_NID are now comma separated lists, so update CdmaServiceTracker accordingly. Note: For now, we still only store away the first of each. Also remove H_SID and H_NID fetching from RuimRecords.java, since it is unused (and unlikely to be used) in that class. --- .../internal/telephony/cdma/CdmaServiceStateTracker.java | 11 +++++++++-- .../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]; -- cgit v1.2.3-59-g8ed1b