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

Commit 918a68b3 authored by Chalard Jean's avatar Chalard Jean
Browse files

Move constants into a new file. 

Also audit all constants, make some private, annotate some
with @VisibleForTesting.

Test: runtest framework && cts
Change-Id: Iaf5ea7abd36fd8d544dcc84654f6cb529196d654
parent f474fc3a

services/core/java/com/android/server/connectivity/ConnectivityConstants.java

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.connectivity;



/**

 * A class encapsulating various constants used by Connectivity.

 * @hide

 */

public class ConnectivityConstants {

    // IPC constants

    public static final String ACTION_NETWORK_CONDITIONS_MEASURED =

            "android.net.conn.NETWORK_CONDITIONS_MEASURED";

    public static final String EXTRA_CONNECTIVITY_TYPE = "extra_connectivity_type";

    public static final String EXTRA_NETWORK_TYPE = "extra_network_type";

    public static final String EXTRA_RESPONSE_RECEIVED = "extra_response_received";

    public static final String EXTRA_IS_CAPTIVE_PORTAL = "extra_is_captive_portal";

    public static final String EXTRA_CELL_ID = "extra_cellid";

    public static final String EXTRA_SSID = "extra_ssid";

    public static final String EXTRA_BSSID = "extra_bssid";

    /** real time since boot */

    public static final String EXTRA_REQUEST_TIMESTAMP_MS = "extra_request_timestamp_ms";

    public static final String EXTRA_RESPONSE_TIMESTAMP_MS = "extra_response_timestamp_ms";



    public static final String PERMISSION_ACCESS_NETWORK_CONDITIONS =

            "android.permission.ACCESS_NETWORK_CONDITIONS";



    // Penalty applied to scores of Networks that have not been validated.

    public static final int UNVALIDATED_SCORE_PENALTY = 40;



    // Score for explicitly connected network.

    //

    // This ensures that a) the explicitly selected network is never trumped by anything else, and

    // b) the explicitly selected network is never torn down.

    public static final int MAXIMUM_NETWORK_SCORE = 100;

}

services/core/java/com/android/server/connectivity/KeepalivePacketData.java

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.server.connectivity;



import static android.net.util.NetworkConstants.IPV4_HEADER_MIN_LEN;

import static android.net.util.NetworkConstants.UDP_HEADER_LEN;



import android.system.OsConstants;

import android.net.ConnectivityManager;

import android.net.NetworkUtils;
@@ -57,9 +60,6 @@ public class KeepalivePacketData { 
    /** Packet data. A raw byte string of packet data, not including the link-layer header. */

    public final byte[] data;



    private static final int IPV4_HEADER_LENGTH = 20;

    private static final int UDP_HEADER_LENGTH = 8;



    protected KeepalivePacketData(InetAddress srcAddress, int srcPort,

            InetAddress dstAddress, int dstPort, byte[] data) throws InvalidPacketException {

        this.srcAddress = srcAddress;
@@ -111,7 +111,7 @@ public class KeepalivePacketData { 
            throw new InvalidPacketException(ERROR_INVALID_PORT);

        }



        int length = IPV4_HEADER_LENGTH + UDP_HEADER_LENGTH + 1;

        int length = IPV4_HEADER_MIN_LEN + UDP_HEADER_LEN + 1;

        ByteBuffer buf = ByteBuffer.allocate(length);

        buf.order(ByteOrder.BIG_ENDIAN);

        buf.putShort((short) 0x4500);             // IP version and TOS
@@ -130,7 +130,7 @@ public class KeepalivePacketData { 
        buf.putShort((short) 0);                  // UDP checksum

        buf.put((byte) 0xff);                     // NAT-T keepalive

        buf.putShort(ipChecksumOffset, IpUtils.ipChecksum(buf, 0));

        buf.putShort(udpChecksumOffset, IpUtils.udpChecksum(buf, 0, IPV4_HEADER_LENGTH));

        buf.putShort(udpChecksumOffset, IpUtils.udpChecksum(buf, 0, IPV4_HEADER_MIN_LEN));



        return new KeepalivePacketData(srcAddress, srcPort, dstAddress, dstPort, buf.array());

    }

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+2 −10
Original line number Diff line number Diff line
@@ -223,14 +223,6 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 


    // This represents the last score received from the NetworkAgent.

    private int currentScore;

    // Penalty applied to scores of Networks that have not been validated.

    private static final int UNVALIDATED_SCORE_PENALTY = 40;



    // Score for explicitly connected network.

    //

    // This ensures that a) the explicitly selected network is never trumped by anything else, and

    // b) the explicitly selected network is never torn down.

    private static final int MAXIMUM_NETWORK_SCORE = 100;



    // The list of NetworkRequests being satisfied by this Network.

    private final SparseArray<NetworkRequest> mNetworkRequests = new SparseArray<>();
@@ -428,12 +420,12 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
        // down an explicitly selected network before the user gets a chance to prefer it when

        // a higher-scoring network (e.g., Ethernet) is available.

        if (networkMisc.explicitlySelected && (networkMisc.acceptUnvalidated || pretendValidated)) {

            return MAXIMUM_NETWORK_SCORE;

            return ConnectivityConstants.MAXIMUM_NETWORK_SCORE;

        }



        int score = currentScore;

        if (!lastValidated && !pretendValidated && !ignoreWifiUnvalidationPenalty()) {

            score -= UNVALIDATED_SCORE_PENALTY;

            score -= ConnectivityConstants.UNVALIDATED_SCORE_PENALTY;

        }

        if (score < 0) score = 0;

        return score;

services/core/java/com/android/server/connectivity/NetworkDiagnostics.java

+5 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.net.Network; 
import android.net.NetworkUtils;

import android.net.RouteInfo;

import android.net.TrafficStats;

import android.net.util.NetworkConstants;

import android.os.SystemClock;

import android.system.ErrnoException;

import android.system.Os;
@@ -421,8 +422,6 @@ public class NetworkDiagnostics { 
    private class IcmpCheck extends SimpleSocketCheck implements Runnable {

        private static final int TIMEOUT_SEND = 100;

        private static final int TIMEOUT_RECV = 300;

        private static final int ICMPV4_ECHO_REQUEST = 8;

        private static final int ICMPV6_ECHO_REQUEST = 128;

        private static final int PACKET_BUFSIZE = 512;

        private final int mProtocol;

        private final int mIcmpType;
@@ -432,11 +431,11 @@ public class NetworkDiagnostics { 


            if (mAddressFamily == AF_INET6) {

                mProtocol = IPPROTO_ICMPV6;

                mIcmpType = ICMPV6_ECHO_REQUEST;

                mIcmpType = NetworkConstants.ICMPV6_ECHO_REQUEST_TYPE;

                mMeasurement.description = "ICMPv6";

            } else {

                mProtocol = IPPROTO_ICMP;

                mIcmpType = ICMPV4_ECHO_REQUEST;

                mIcmpType = NetworkConstants.ICMPV4_ECHO_REQUEST_TYPE;

                mMeasurement.description = "ICMPv4";

            }
@@ -504,7 +503,6 @@ public class NetworkDiagnostics { 
    private class DnsUdpCheck extends SimpleSocketCheck implements Runnable {

        private static final int TIMEOUT_SEND = 100;

        private static final int TIMEOUT_RECV = 500;

        private static final int DNS_SERVER_PORT = 53;

        private static final int RR_TYPE_A = 1;

        private static final int RR_TYPE_AAAA = 28;

        private static final int PACKET_BUFSIZE = 512;
@@ -546,7 +544,8 @@ public class NetworkDiagnostics { 
            }



            try {

                setupSocket(SOCK_DGRAM, IPPROTO_UDP, TIMEOUT_SEND, TIMEOUT_RECV, DNS_SERVER_PORT);

                setupSocket(SOCK_DGRAM, IPPROTO_UDP, TIMEOUT_SEND, TIMEOUT_RECV,

                        NetworkConstants.DNS_SERVER_PORT);

            } catch (ErrnoException | IOException e) {

                mMeasurement.recordFailure(e.toString());

                return;

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+23 −30
Original line number Diff line number Diff line
@@ -122,22 +122,6 @@ public class NetworkMonitor extends StateMachine { 
        }

    }



    public static final String ACTION_NETWORK_CONDITIONS_MEASURED =

            "android.net.conn.NETWORK_CONDITIONS_MEASURED";

    public static final String EXTRA_CONNECTIVITY_TYPE = "extra_connectivity_type";

    public static final String EXTRA_NETWORK_TYPE = "extra_network_type";

    public static final String EXTRA_RESPONSE_RECEIVED = "extra_response_received";

    public static final String EXTRA_IS_CAPTIVE_PORTAL = "extra_is_captive_portal";

    public static final String EXTRA_CELL_ID = "extra_cellid";

    public static final String EXTRA_SSID = "extra_ssid";

    public static final String EXTRA_BSSID = "extra_bssid";

    /** real time since boot */

    public static final String EXTRA_REQUEST_TIMESTAMP_MS = "extra_request_timestamp_ms";

    public static final String EXTRA_RESPONSE_TIMESTAMP_MS = "extra_response_timestamp_ms";



    private static final String PERMISSION_ACCESS_NETWORK_CONDITIONS =

            "android.permission.ACCESS_NETWORK_CONDITIONS";



    // After a network has been tested this result can be sent with EVENT_NETWORK_TESTED.

    // The network should be used as a default internet connection.  It was found to be:

    // 1. a functioning network providing internet access, or
@@ -1136,7 +1120,8 @@ public class NetworkMonitor extends StateMachine { 
            return;

        }



        Intent latencyBroadcast = new Intent(ACTION_NETWORK_CONDITIONS_MEASURED);

        Intent latencyBroadcast =

                new Intent(ConnectivityConstants.ACTION_NETWORK_CONDITIONS_MEASURED);

        switch (mNetworkAgentInfo.networkInfo.getType()) {

            case ConnectivityManager.TYPE_WIFI:

                WifiInfo currentWifiInfo = mWifiManager.getConnectionInfo();
@@ -1148,15 +1133,18 @@ public class NetworkMonitor extends StateMachine { 
                    // not change it here as it would become impossible to tell whether the SSID is

                    // simply being surrounded by quotes due to the API, or whether those quotes

                    // are actually part of the SSID.

                    latencyBroadcast.putExtra(EXTRA_SSID, currentWifiInfo.getSSID());

                    latencyBroadcast.putExtra(EXTRA_BSSID, currentWifiInfo.getBSSID());

                    latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_SSID,

                            currentWifiInfo.getSSID());

                    latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_BSSID,

                            currentWifiInfo.getBSSID());

                } else {

                    if (VDBG) logw("network info is TYPE_WIFI but no ConnectionInfo found");

                    return;

                }

                break;

            case ConnectivityManager.TYPE_MOBILE:

                latencyBroadcast.putExtra(EXTRA_NETWORK_TYPE, mTelephonyManager.getNetworkType());

                latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_NETWORK_TYPE,

                        mTelephonyManager.getNetworkType());

                List<CellInfo> info = mTelephonyManager.getAllCellInfo();

                if (info == null) return;

                int numRegisteredCellInfo = 0;
@@ -1170,16 +1158,16 @@ public class NetworkMonitor extends StateMachine { 
                        }

                        if (cellInfo instanceof CellInfoCdma) {

                            CellIdentityCdma cellId = ((CellInfoCdma) cellInfo).getCellIdentity();

                            latencyBroadcast.putExtra(EXTRA_CELL_ID, cellId);

                            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_CELL_ID, cellId);

                        } else if (cellInfo instanceof CellInfoGsm) {

                            CellIdentityGsm cellId = ((CellInfoGsm) cellInfo).getCellIdentity();

                            latencyBroadcast.putExtra(EXTRA_CELL_ID, cellId);

                            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_CELL_ID, cellId);

                        } else if (cellInfo instanceof CellInfoLte) {

                            CellIdentityLte cellId = ((CellInfoLte) cellInfo).getCellIdentity();

                            latencyBroadcast.putExtra(EXTRA_CELL_ID, cellId);

                            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_CELL_ID, cellId);

                        } else if (cellInfo instanceof CellInfoWcdma) {

                            CellIdentityWcdma cellId = ((CellInfoWcdma) cellInfo).getCellIdentity();

                            latencyBroadcast.putExtra(EXTRA_CELL_ID, cellId);

                            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_CELL_ID, cellId);

                        } else {

                            if (VDBG) logw("Registered cellinfo is unrecognized");

                            return;
@@ -1190,16 +1178,21 @@ public class NetworkMonitor extends StateMachine { 
            default:

                return;

        }

        latencyBroadcast.putExtra(EXTRA_CONNECTIVITY_TYPE, mNetworkAgentInfo.networkInfo.getType());

        latencyBroadcast.putExtra(EXTRA_RESPONSE_RECEIVED, responseReceived);

        latencyBroadcast.putExtra(EXTRA_REQUEST_TIMESTAMP_MS, requestTimestampMs);

        latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_CONNECTIVITY_TYPE,

                mNetworkAgentInfo.networkInfo.getType());

        latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_RESPONSE_RECEIVED,

                responseReceived);

        latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_REQUEST_TIMESTAMP_MS,

                requestTimestampMs);



        if (responseReceived) {

            latencyBroadcast.putExtra(EXTRA_IS_CAPTIVE_PORTAL, isCaptivePortal);

            latencyBroadcast.putExtra(EXTRA_RESPONSE_TIMESTAMP_MS, responseTimestampMs);

            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_IS_CAPTIVE_PORTAL,

                    isCaptivePortal);

            latencyBroadcast.putExtra(ConnectivityConstants.EXTRA_RESPONSE_TIMESTAMP_MS,

                    responseTimestampMs);

        }

        mContext.sendBroadcastAsUser(latencyBroadcast, UserHandle.CURRENT,

                PERMISSION_ACCESS_NETWORK_CONDITIONS);

                ConnectivityConstants.PERMISSION_ACCESS_NETWORK_CONDITIONS);

    }



    private void logNetworkEvent(int evtype) {