diff options
| author | Wink Saville <wink@google.com> | 2011-05-02 12:05:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-02 12:05:02 -0700 |
| commit | c56e87e72147dbda9929b2e2363a7ded5608db1d (patch) | |
| tree | 9b5c1afda65d64591e0f409723f9de98ef077c6f | |
| parent | 3a5c227279011f850036c29e7c0bc96023298d5c (diff) | |
| parent | 0fa7d106d4e34559c6e208f731c319cf681c0583 (diff) | |
| download | frameworks_base-c56e87e72147dbda9929b2e2363a7ded5608db1d.zip frameworks_base-c56e87e72147dbda9929b2e2363a7ded5608db1d.tar.gz frameworks_base-c56e87e72147dbda9929b2e2363a7ded5608db1d.tar.bz2 | |
am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState.
* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
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 c052e51..490051d 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -3024,7 +3024,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 { @@ -3033,7 +3033,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(); |