diff options
| author | 2009-07-23 17:01:57 -0700 | |
|---|---|---|
| committer | 2009-07-23 17:01:57 -0700 | |
| commit | 8c4ee20f52b6abb2b66e63bc211b78c8ef239c22 (patch) | |
| tree | 74f3e1149aa8b5206d4e32ae33bdfa504981ace8 | |
| parent | d3eb53114675b6a692106b31e0737e04be1c0b05 (diff) | |
| parent | 97b270abd5e5200a3c512e08e06033397e2abfd6 (diff) | |
Merge change 8426
* changes:
Fix bug# 1997056
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CommandsInterface.java | 4 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java index a7ac2bc9ceb2..ebdac4ec4253 100644 --- a/telephony/java/com/android/internal/telephony/CommandsInterface.java +++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java @@ -1225,8 +1225,8 @@ public interface CommandsInterface { * Request the device MDN / H_SID / H_NID / MIN. * "response" is const char ** * [0] is MDN if CDMA subscription is available - * [1] is H_SID (Home SID) if CDMA subscription is available - * [2] is H_NID (Home NID) if CDMA subscription is available + * [1] is H_SID (Home SID) in hexadecimal if CDMA subscription is available + * [2] is H_NID (Home NID) in hexadecimal if CDMA subscription is available * [3] is MIN (10 digits, MIN2+MIN1) if CDMA subscription is available */ public void getCDMASubscription(Message response); diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index e78570988f59..d5da66666473 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -401,11 +401,11 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { // 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; + mHomeSystemId = sid.length > 0 ? Integer.parseInt(sid[0], 16) : 0; } if (cdmaSubscription[2] != null) { String[] nid = cdmaSubscription[2].split(","); - mHomeNetworkId = nid.length > 0 ? Integer.parseInt(nid[0]) : 0; + mHomeNetworkId = nid.length > 0 ? Integer.parseInt(nid[0], 16) : 0; } mMin = cdmaSubscription[3]; mPrlVersion = cdmaSubscription[4]; |