diff options
| author | Wink Saville <wink@google.com> | 2011-05-02 11:51:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-02 11:51:20 -0700 |
| commit | 0fa7d106d4e34559c6e208f731c319cf681c0583 (patch) | |
| tree | 68d2d93ab7de330ef64229e2a39612f710a4916c | |
| parent | a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08 (diff) | |
| parent | aa44b52ee07eb4937d23bb3c2464007a2eb3f50f (diff) | |
| download | frameworks_base-0fa7d106d4e34559c6e208f731c319cf681c0583.zip frameworks_base-0fa7d106d4e34559c6e208f731c319cf681c0583.tar.gz frameworks_base-0fa7d106d4e34559c6e208f731c319cf681c0583.tar.bz2 | |
am aa44b52e: Fix bug in RIL#getDataCallState.
* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
Fix bug in RIL#getDataCallState.
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RIL.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index f347623..6edd0b6 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -3025,7 +3025,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { dataCall.active = p.readInt(); dataCall.type = p.readString(); String addresses = p.readString(); - if (TextUtils.isEmpty(addresses)) { + if (!TextUtils.isEmpty(addresses)) { dataCall.addresses = addresses.split(" "); } } else { @@ -3034,7 +3034,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { dataCall.active = p.readInt(); dataCall.type = p.readString(); dataCall.ifname = p.readString(); - if (TextUtils.isEmpty(dataCall.ifname)) { + if ((dataCall.status == DataConnection.FailCause.NONE.getErrorCode()) && + TextUtils.isEmpty(dataCall.ifname)) { throw new RuntimeException("getDataCallState, no ifname"); } String addresses = p.readString(); |