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

Commit 152418b2 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Address further API council comments." into rvc-dev am: 41806325 am: 3bc78160 

Change-Id: Ibe4416ece0bb47c6705e8ed2452876f3398267ba
parents e4892f6b 3bc78160

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+3 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.telephony.Rlog; 


import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.time.Duration;

import java.util.ArrayList;

import java.util.List;

import java.util.UUID;
@@ -315,7 +316,7 @@ public class DcNetworkAgent extends NetworkAgent { 
    }



    @Override

    public synchronized void onStartSocketKeepalive(int slot, int intervalSeconds,

    public synchronized void onStartSocketKeepalive(int slot, @NonNull Duration interval,

            @NonNull KeepalivePacketData packet) {

        if (mDataConnection == null) {

            loge("onStartSocketKeepalive called on no-owner DcNetworkAgent!");
@@ -324,7 +325,7 @@ public class DcNetworkAgent extends NetworkAgent { 


        if (packet instanceof NattKeepalivePacketData) {

            mDataConnection.obtainMessage(DataConnection.EVENT_KEEPALIVE_START_REQUEST,

                    slot, intervalSeconds, packet).sendToTarget();

                    slot, (int) interval.getSeconds(), packet).sendToTarget();

        } else {

            sendSocketKeepaliveEvent(slot, SocketKeepalive.ERROR_UNSUPPORTED);

        }