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

Commit 019fc49b authored by Aaron Huang's avatar Aaron Huang
Browse files

API review: change to use getter to access a field 

Fields in KeepalivePacketData are changed to private and
add getter as API.

Bug: 151322799
Test: atest FrameworksNetTests
      atest FrameworksWifiTests
      atest FrameworksTelephonyTests: some failure in CarrierAppUtilsTest
Copy from ag/10731077
Change-Id: I6d5be90eafceb2ce0220cd5fc8b86cc20e407999
Merged-In: I6d5be90eafceb2ce0220cd5fc8b86cc20e407999
parent 0d58d7f5

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

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


            req.cid = contextId;



            if (packetData.dstAddress instanceof Inet4Address) {

            if (packetData.getDstAddress() instanceof Inet4Address) {

                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;

            } else {

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

            }



            final InetAddress srcAddress = packetData.getSrcAddress();

            final InetAddress dstAddress = packetData.getDstAddress();

            appendPrimitiveArrayToArrayList(

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

            req.sourcePort = packetData.srcPort;

                    srcAddress.getAddress(), req.sourceAddress);

            req.sourcePort = packetData.getSrcPort();

            appendPrimitiveArrayToArrayList(

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

            req.destinationPort = packetData.dstPort;

                    dstAddress.getAddress(), req.destinationAddress);

            req.destinationPort = packetData.getDstPort();

            req.maxKeepaliveIntervalMillis = intervalMillis;



            radioProxy11.startKeepalive(rr.mSerial, req);