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

Commit 8ba653df authored by Aaron Huang's avatar Aaron Huang Committed by Android (Google) Code Review
Browse files

Merge "AIP review: change to use getter to access a field" into rvc-dev

parents 056d8410 06f9bbb5

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -4978,9 +4978,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 




            req.cid = contextId;

            req.cid = contextId;





            if (packetData.dstAddress instanceof Inet4Address) {

            if (packetData.getDstAddress() instanceof Inet4Address) {

                req.type = android.hardware.radio.V1_1.KeepaliveType.NATT_IPV4;

                req.type = android.hardware.radio.V1_1.KeepaliveType.NATT_IPV4;

            } else if (packetData.dstAddress instanceof Inet6Address) {

            } else if (packetData.getDstAddress() instanceof Inet6Address) {

                req.type = android.hardware.radio.V1_1.KeepaliveType.NATT_IPV6;

                req.type = android.hardware.radio.V1_1.KeepaliveType.NATT_IPV6;

            } else {

            } else {

                AsyncResult.forMessage(result, null,

                AsyncResult.forMessage(result, null,
@@ -4989,12 +4989,14 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                return;

                return;

            }

            }





            final InetAddress srcAddress = packetData.getSrcAddress();

            final InetAddress dstAddress = packetData.getDstAddress();

            appendPrimitiveArrayToArrayList(

            appendPrimitiveArrayToArrayList(

                    packetData.srcAddress.getAddress(), req.sourceAddress);

                    srcAddress.getAddress(), req.sourceAddress);

            req.sourcePort = packetData.srcPort;

            req.sourcePort = packetData.getSrcPort();

            appendPrimitiveArrayToArrayList(

            appendPrimitiveArrayToArrayList(

                    packetData.dstAddress.getAddress(), req.destinationAddress);

                    dstAddress.getAddress(), req.destinationAddress);

            req.destinationPort = packetData.dstPort;

            req.destinationPort = packetData.getDstPort();

            req.maxKeepaliveIntervalMillis = intervalMillis;

            req.maxKeepaliveIntervalMillis = intervalMillis;





            radioProxy11.startKeepalive(rr.mSerial, req);

            radioProxy11.startKeepalive(rr.mSerial, req);