am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState.

* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
  Fix bug in RIL#getDataCallState.
This commit is contained in:
Wink Saville
2011-05-02 12:05:02 -07:00
committed by Android Git Automerger

View File

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