Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7359 into donut

Browse Source 
* changes:
  Minor tweak to CDMA_SUBSCRIPTION.
This commit is contained in:
Android (Google) Code Review
2009-07-15 16:58:11 -07:00
parent 82b283a9bf ae49180f28
commit 8e0fb366fc
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -665,8 +665,15 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
if (cdmaSubscription != null && cdmaSubscription.length >= 4) { if (cdmaSubscription != null && cdmaSubscription.length >= 4) {
mMdn = cdmaSubscription[0]; mMdn = cdmaSubscription[0];
mHomeSystemId = Integer.parseInt(cdmaSubscription[1], 16); // TODO: Only grabbing the first SID/NID for now.
mHomeNetworkId = Integer.parseInt(cdmaSubscription[2], 16); 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]; mMin = cdmaSubscription[3];
} else { } else {

4
telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
View File

@@ -55,8 +55,6 @@ public final class RuimRecords extends IccRecords {
private String mImsi; private String mImsi;
private String mMyMobileNumber; private String mMyMobileNumber;
private String mSid;
private String mNid;
private String mMin2Min1; private String mMin2Min1;
private String mPrlVersion; private String mPrlVersion;
@@ -242,8 +240,6 @@ public final class RuimRecords extends IccRecords {
m_ota_commited = false; m_ota_commited = false;
} }
mMyMobileNumber = localTemp[0]; mMyMobileNumber = localTemp[0];
mSid = localTemp[1];
mNid = localTemp[2];
mMin2Min1 = localTemp[3]; mMin2Min1 = localTemp[3];
mPrlVersion = localTemp[4]; mPrlVersion = localTemp[4];