From aa44b52ee07eb4937d23bb3c2464007a2eb3f50f Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Mon, 2 May 2011 10:00:53 -0700
Subject: [PATCH] Fix bug in RIL#getDataCallState.

Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
---
 telephony/java/com/android/internal/telephony/RIL.java | 5 +++--
 1 file 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 f347623aa34eb..6edd0b6280d93 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();