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

Commit a5264ca9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update KeepalivePacketData.toString()" am: 9736c83c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2035089

Change-Id: Ieda4be3eb265ba33817b8372a35531c96be16a31
parents 19e2d2c7 9736c83c

src/java/com/android/internal/telephony/data/KeepaliveTracker.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -189,9 +189,7 @@ public class KeepaliveTracker extends Handler { 
    private void onStartSocketKeepaliveRequested(int slotIndex, @NonNull Duration interval,

    private void onStartSocketKeepaliveRequested(int slotIndex, @NonNull Duration interval,

            @NonNull KeepalivePacketData packet) {

            @NonNull KeepalivePacketData packet) {

        log("onStartSocketKeepaliveRequested: slot=" + slotIndex + ", interval="

        log("onStartSocketKeepaliveRequested: slot=" + slotIndex + ", interval="

                + interval.getSeconds() + "s, src=" + packet.getSrcAddress() + ":"

                + interval.getSeconds() + "s, packet=" + packet);

                + packet.getSrcPort() + ", dst=" + packet.getDstAddress() + ":"

                + packet.getDstPort() + ", packet.length=" + packet.getPacket().length);

        if (packet instanceof NattKeepalivePacketData) {

        if (packet instanceof NattKeepalivePacketData) {

            if (mDataNetwork.getTransport() == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {

            if (mDataNetwork.getTransport() == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {

                mPhone.mCi.startNattKeepalive(mDataNetwork.getId(), packet,

                mPhone.mCi.startNattKeepalive(mDataNetwork.getId(), packet,