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

Commit 8a2fe55a authored by junyulai's avatar junyulai Committed by Chalard Jean
Browse files

[KA02] internal cleanup and refactor for SocketKeepalive 

In previous change, the new SocketKeepalive API was exported.
But internally, old PacketKeepalive names and structures are
still used.

This change rename them properly for code consistency and also
refactor KeepalivePacketData to support different types of
KeepalivePacketData.

Bug: 114151147
Test: 1. atest FrameworksNetTests
      2. atest FrameworksWifiTests
      3. atest FrameworksTelephonyTests

Change-Id: I9898324d2733b7012a372b1671b390c162544227
Merged-In: I9898324d2733b7012a372b1671b390c162544227
parent ffd2956a

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

+30 −27
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import static android.net.NetworkPolicyManager.OVERRIDE_UNMETERED; 
import android.app.PendingIntent;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.PacketKeepalive;

import android.net.KeepalivePacketData;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.NattKeepalivePacketData;

import android.net.NetworkAgent;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;
@@ -33,6 +33,7 @@ import android.net.NetworkMisc; 
import android.net.NetworkUtils;

import android.net.ProxyInfo;

import android.net.RouteInfo;

import android.net.SocketKeepalive;

import android.net.StringNetworkSpecifier;

import android.os.AsyncResult;

import android.os.Looper;
@@ -1449,9 +1450,8 @@ public class DataConnection extends StateMachine { 
                case EVENT_KEEPALIVE_START_REQUEST:

                case EVENT_KEEPALIVE_STOP_REQUEST:

                    if (mNetworkAgent != null) {

                        mNetworkAgent.onPacketKeepaliveEvent(

                                msg.arg1,

                                ConnectivityManager.PacketKeepalive.ERROR_INVALID_NETWORK);

                        mNetworkAgent.onSocketKeepaliveEvent(

                                msg.arg1, SocketKeepalive.ERROR_INVALID_NETWORK);

                    }

                    break;

                default:
@@ -1990,9 +1990,8 @@ public class DataConnection extends StateMachine { 
                        // so that keepalive requests can be handled (if supported) by the

                        // underlying transport.

                        if (mNetworkAgent != null) {

                            mNetworkAgent.onPacketKeepaliveEvent(

                                    msg.arg1,

                                    ConnectivityManager.PacketKeepalive.ERROR_INVALID_NETWORK);

                            mNetworkAgent.onSocketKeepaliveEvent(

                                    msg.arg1, SocketKeepalive.ERROR_INVALID_NETWORK);

                        }

                    }

                    retVal = HANDLED;
@@ -2002,7 +2001,7 @@ public class DataConnection extends StateMachine { 
                    int slotId = msg.arg1;

                    int handle = mNetworkAgent.keepaliveTracker.getHandleForSlot(slotId);

                    if (handle < 0) {

                        loge("No slot found for stopPacketKeepalive! " + slotId);

                        loge("No slot found for stopSocketKeepalive! " + slotId);

                        retVal = HANDLED;

                        break;

                    } else {
@@ -2021,8 +2020,8 @@ public class DataConnection extends StateMachine { 
                    if (ar.exception != null || ar.result == null) {

                        loge("EVENT_KEEPALIVE_STARTED: error starting keepalive, e="

                                + ar.exception);

                        mNetworkAgent.onPacketKeepaliveEvent(

                                slot, ConnectivityManager.PacketKeepalive.ERROR_HARDWARE_ERROR);

                        mNetworkAgent.onSocketKeepaliveEvent(

                                slot, SocketKeepalive.ERROR_HARDWARE_ERROR);

                    } else {

                        KeepaliveStatus ks = (KeepaliveStatus) ar.result;

                        if (ks == null) {
@@ -2309,13 +2308,17 @@ public class DataConnection extends StateMachine { 
        }



        @Override

        protected void startPacketKeepalive(Message msg) {

        protected void startSocketKeepalive(Message msg) {

            if (msg.obj instanceof NattKeepalivePacketData) {

                DataConnection.this.obtainMessage(EVENT_KEEPALIVE_START_REQUEST,

                        msg.arg1, msg.arg2, msg.obj).sendToTarget();

            } else {

                onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED);

            }

        }



        @Override

        protected void stopPacketKeepalive(Message msg) {

        protected void stopSocketKeepalive(Message msg) {

            DataConnection.this.obtainMessage(EVENT_KEEPALIVE_STOP_REQUEST,

                    msg.arg1, msg.arg2, msg.obj).sendToTarget();

        }
@@ -2344,25 +2347,25 @@ public class DataConnection extends StateMachine { 
            int keepaliveStatusErrorToPacketKeepaliveError(int error) {

                switch(error) {

                    case KeepaliveStatus.ERROR_NONE:

                        return PacketKeepalive.SUCCESS;

                        return SocketKeepalive.SUCCESS;

                    case KeepaliveStatus.ERROR_UNSUPPORTED:

                        return PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED;

                        return SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;

                    case KeepaliveStatus.ERROR_NO_RESOURCES:

                    case KeepaliveStatus.ERROR_UNKNOWN:

                    default:

                        return PacketKeepalive.ERROR_HARDWARE_ERROR;

                        return SocketKeepalive.ERROR_HARDWARE_ERROR;

                }

            }



            void handleKeepaliveStarted(final int slot, KeepaliveStatus ks) {

                switch (ks.statusCode) {

                    case KeepaliveStatus.STATUS_INACTIVE:

                        DcNetworkAgent.this.onPacketKeepaliveEvent(slot,

                        DcNetworkAgent.this.onSocketKeepaliveEvent(slot,

                                keepaliveStatusErrorToPacketKeepaliveError(ks.errorCode));

                        break;

                    case KeepaliveStatus.STATUS_ACTIVE:

                        DcNetworkAgent.this.onPacketKeepaliveEvent(

                                slot, PacketKeepalive.SUCCESS);

                        DcNetworkAgent.this.onSocketKeepaliveEvent(

                                slot, SocketKeepalive.SUCCESS);

                        // fall through to add record

                    case KeepaliveStatus.STATUS_PENDING:

                        log("Adding keepalive handle="
@@ -2392,13 +2395,13 @@ public class DataConnection extends StateMachine { 
                switch (kr.currentStatus) {

                    case KeepaliveStatus.STATUS_INACTIVE:

                        loge("Inactive Keepalive received status!");

                        DcNetworkAgent.this.onPacketKeepaliveEvent(

                                kr.slotId, PacketKeepalive.ERROR_HARDWARE_ERROR);

                        DcNetworkAgent.this.onSocketKeepaliveEvent(

                                kr.slotId, SocketKeepalive.ERROR_HARDWARE_ERROR);

                        break;

                    case KeepaliveStatus.STATUS_PENDING:

                        switch (ks.statusCode) {

                            case KeepaliveStatus.STATUS_INACTIVE:

                                DcNetworkAgent.this.onPacketKeepaliveEvent(kr.slotId,

                                DcNetworkAgent.this.onSocketKeepaliveEvent(kr.slotId,

                                        keepaliveStatusErrorToPacketKeepaliveError(ks.errorCode));

                                kr.currentStatus = KeepaliveStatus.STATUS_INACTIVE;

                                mKeepalives.remove(ks.sessionHandle);
@@ -2406,8 +2409,8 @@ public class DataConnection extends StateMachine { 
                            case KeepaliveStatus.STATUS_ACTIVE:

                                log("Pending Keepalive received active status!");

                                kr.currentStatus = KeepaliveStatus.STATUS_ACTIVE;

                                DcNetworkAgent.this.onPacketKeepaliveEvent(

                                        kr.slotId, PacketKeepalive.SUCCESS);

                                DcNetworkAgent.this.onSocketKeepaliveEvent(

                                        kr.slotId, SocketKeepalive.SUCCESS);

                                break;

                            case KeepaliveStatus.STATUS_PENDING:

                                loge("Invalid unsolicied Keepalive Pending Status!");
@@ -2420,8 +2423,8 @@ public class DataConnection extends StateMachine { 
                        switch (ks.statusCode) {

                            case KeepaliveStatus.STATUS_INACTIVE:

                                loge("Keepalive received stopped status!");

                                DcNetworkAgent.this.onPacketKeepaliveEvent(

                                        kr.slotId, PacketKeepalive.SUCCESS);

                                DcNetworkAgent.this.onSocketKeepaliveEvent(

                                        kr.slotId, SocketKeepalive.SUCCESS);

                                kr.currentStatus = KeepaliveStatus.STATUS_INACTIVE;

                                mKeepalives.remove(ks.sessionHandle);

                                break;

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+4 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.content.pm.ServiceInfo; 
import android.net.KeepalivePacketData;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.NattKeepalivePacketData;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkUtils;
@@ -610,7 +611,7 @@ public class DataConnectionTest extends TelephonyTest { 
        final int interval = 10; // seconds

        // Construct a new KeepalivePacketData request as we would receive from a Network Agent,

        // and check that the packet is sent to the RIL.

        KeepalivePacketData kd = KeepalivePacketData.nattKeepalivePacket(

        KeepalivePacketData kd = NattKeepalivePacketData.nattKeepalivePacket(

                NetworkUtils.numericToInetAddress("1.2.3.4"),

                1234,

                NetworkUtils.numericToInetAddress("8.8.8.8"),
@@ -634,7 +635,7 @@ public class DataConnectionTest extends TelephonyTest { 
        final int interval = 10; // seconds

        // Construct a new KeepalivePacketData request as we would receive from a Network Agent,

        // and check that the packet is sent to the RIL.

        KeepalivePacketData kd = KeepalivePacketData.nattKeepalivePacket(

        KeepalivePacketData kd = NattKeepalivePacketData.nattKeepalivePacket(

                NetworkUtils.numericToInetAddress("1.2.3.4"),

                1234,

                NetworkUtils.numericToInetAddress("8.8.8.8"),
@@ -713,7 +714,7 @@ public class DataConnectionTest extends TelephonyTest { 
        final int interval = 10; // seconds

        // Construct a new KeepalivePacketData request as we would receive from a Network Agent,

        // and check that the packet is sent to the RIL.

        KeepalivePacketData kd = KeepalivePacketData.nattKeepalivePacket(

        KeepalivePacketData kd = NattKeepalivePacketData.nattKeepalivePacket(

                NetworkUtils.numericToInetAddress("1.2.3.4"),

                1234,

                NetworkUtils.numericToInetAddress("8.8.8.8"),