diff options
| author | johnwang <johnwang@google.com> | 2009-07-23 15:46:46 -0700 |
|---|---|---|
| committer | johnwang <johnwang@google.com> | 2009-07-23 16:25:59 -0700 |
| commit | 97b270abd5e5200a3c512e08e06033397e2abfd6 (patch) | |
| tree | 4276e726eb761a66d8d057524594061a14de7f00 /telephony | |
| parent | ebd7bc54028949619bbf3fa5ed6c1188f588c230 (diff) | |
| download | frameworks_base-97b270abd5e5200a3c512e08e06033397e2abfd6.zip frameworks_base-97b270abd5e5200a3c512e08e06033397e2abfd6.tar.gz frameworks_base-97b270abd5e5200a3c512e08e06033397e2abfd6.tar.bz2 | |
Fix bug# 1997056
The SID and NID in CDMA_SUBSCRIPTION are in hexadecimal format. So change the parseInt() in CdmaServiceStateTracker and add comments in CommandsInterface.
modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java
modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java
Diffstat (limited to 'telephony')
| -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 a7ac2bc..ebdac4e 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 e785709..d5da666 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]; |