am aa44b52e: Fix bug in RIL#getDataCallState.

* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
  Fix bug in RIL#getDataCallState.
This commit is contained in:
Wink Saville
2011-05-02 11:51:20 -07:00
committed by Android Git Automerger

View File

@@ -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();