Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56e87e7 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

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

* commit '0fa7d106':
  Fix bug in RIL#getDataCallState.
parents 3a5c2272 0fa7d106

telephony/java/com/android/internal/telephony/RIL.java

+3 −2
Original line number Diff line number Diff line
@@ -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();