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

Commit 3fab1c74 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge changes Ieef54d84,Ica3e88c2 

* changes:
  Remove NetworkStack dependencies on hidden members
  Expose ServiceSpecificException as @SystemApi.
parents 612aac86 a0983f73

src/android/net/dhcp/DhcpServingParams.java

+5 −5
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import android.annotation.Nullable; 
import android.net.IpPrefix;

import android.net.LinkAddress;

import android.net.NetworkUtils;



import com.google.android.collect.Sets;

import android.util.ArraySet;



import java.net.Inet4Address;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashSet;

import java.util.Set;
@@ -208,7 +208,7 @@ public class DhcpServingParams { 
         * but it must always be set explicitly before building the {@link DhcpServingParams}.

         */

        public Builder setDefaultRouters(@NonNull Inet4Address... defaultRouters) {

            return setDefaultRouters(Sets.newArraySet(defaultRouters));

            return setDefaultRouters(new ArraySet<>(Arrays.asList(defaultRouters)));

        }



        /**
@@ -238,7 +238,7 @@ public class DhcpServingParams { 
         * building the {@link DhcpServingParams}.

         */

        public Builder setDnsServers(@NonNull Inet4Address... dnsServers) {

            return setDnsServers(Sets.newArraySet(dnsServers));

            return setDnsServers(new ArraySet<>(Arrays.asList(dnsServers)));

        }



        /**
@@ -268,7 +268,7 @@ public class DhcpServingParams { 
         * and do not need to be set here.

         */

        public Builder setExcludedAddrs(@NonNull Inet4Address... excludedAddrs) {

            return setExcludedAddrs(Sets.newArraySet(excludedAddrs));

            return setExcludedAddrs(new ArraySet<>(Arrays.asList(excludedAddrs)));

        }



        /**

src/com/android/server/connectivity/NetworkMonitor.java

+21 −28
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.net.ConnectivityManager.EXTRA_CAPTIVE_PORTAL_URL; 
import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.INetworkMonitor.NETWORK_TEST_RESULT_INVALID;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.metrics.ValidationProbeEvent.DNS_FAILURE;
@@ -80,7 +81,6 @@ import android.util.Log; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.Protocol;

import com.android.internal.util.RingBufferIndices;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;
@@ -150,29 +150,28 @@ public class NetworkMonitor extends StateMachine { 
        }

    }



    private static final int BASE = Protocol.BASE_NETWORK_MONITOR;

    /**

     * ConnectivityService has sent a notification to indicate that network has connected.

     * Initiates Network Validation.

     */

    private static final int CMD_NETWORK_CONNECTED = BASE + 1;

    private static final int CMD_NETWORK_CONNECTED = 1;



    /**

     * Message to self indicating it's time to evaluate a network's connectivity.

     * arg1 = Token to ignore old messages.

     */

    private static final int CMD_REEVALUATE = BASE + 6;

    private static final int CMD_REEVALUATE = 6;



    /**

     * ConnectivityService has sent a notification to indicate that network has disconnected.

     */

    private static final int CMD_NETWORK_DISCONNECTED = BASE + 7;

    private static final int CMD_NETWORK_DISCONNECTED = 7;



    /**

     * Force evaluation even if it has succeeded in the past.

     * arg1 = UID responsible for requesting this reeval.  Will be billed for data.

     */

    private static final int CMD_FORCE_REEVALUATION = BASE + 8;

    private static final int CMD_FORCE_REEVALUATION = 8;



    /**

     * Message to self indicating captive portal app finished.
@@ -181,7 +180,7 @@ public class NetworkMonitor extends StateMachine { 
     *                APP_RETURN_WANTED_AS_IS

     * obj = mCaptivePortalLoggedInResponseToken as String

     */

    private static final int CMD_CAPTIVE_PORTAL_APP_FINISHED = BASE + 9;

    private static final int CMD_CAPTIVE_PORTAL_APP_FINISHED = 9;



    /**

     * Message indicating sign-in app should be launched.
@@ -190,14 +189,14 @@ public class NetworkMonitor extends StateMachine { 
     * ConnectivityService when the user touches the "sign into

     * network" button in the wifi access point detail page.

     */

    private static final int CMD_LAUNCH_CAPTIVE_PORTAL_APP = BASE + 11;

    private static final int CMD_LAUNCH_CAPTIVE_PORTAL_APP = 11;



    /**

     * Retest network to see if captive portal is still in place.

     * arg1 = UID responsible for requesting this reeval.  Will be billed for data.

     *        0 indicates self-initiated, so nobody to blame.

     */

    private static final int CMD_CAPTIVE_PORTAL_RECHECK = BASE + 12;

    private static final int CMD_CAPTIVE_PORTAL_RECHECK = 12;



    /**

     * ConnectivityService notifies NetworkMonitor of settings changes to
@@ -210,20 +209,20 @@ public class NetworkMonitor extends StateMachine { 
     * states, including being ignored until after an ongoing captive portal

     * validation phase is completed.

     */

    private static final int CMD_PRIVATE_DNS_SETTINGS_CHANGED = BASE + 13;

    private static final int CMD_EVALUATE_PRIVATE_DNS = BASE + 15;

    private static final int CMD_PRIVATE_DNS_SETTINGS_CHANGED = 13;

    private static final int CMD_EVALUATE_PRIVATE_DNS = 15;



    /**

     * Message to self indicating captive portal detection is completed.

     * obj = CaptivePortalProbeResult for detection result;

     */

    public static final int CMD_PROBE_COMPLETE = BASE + 16;

    public static final int CMD_PROBE_COMPLETE = 16;



    /**

     * ConnectivityService notifies NetworkMonitor of DNS query responses event.

     * arg1 = returncode in OnDnsEvent which indicates the response code for the DNS query.

     */

    public static final int EVENT_DNS_NOTIFICATION = BASE + 17;

    public static final int EVENT_DNS_NOTIFICATION = 17;



    // Start mReevaluateDelayMs at this value and double.

    private static final int INITIAL_REEVALUATE_DELAY_MS = 1000;
@@ -245,7 +244,6 @@ public class NetworkMonitor extends StateMachine { 
    private final INetworkMonitorCallbacks mCallback;

    private final Network mNetwork;

    private final Network mNonPrivateDnsBypassNetwork;

    private final int mNetId;

    private final TelephonyManager mTelephonyManager;

    private final WifiManager mWifiManager;

    private final ConnectivityManager mCm;
@@ -322,7 +320,7 @@ public class NetworkMonitor extends StateMachine { 
            NetworkRequest defaultRequest, IpConnectivityLog logger, SharedLog validationLogs,

            Dependencies deps) {

        // Add suffix indicating which NetworkMonitor we're talking about.

        super(TAG + "/" + network.netId);

        super(TAG + "/" + network.toString());



        // Logs with a tag of the form given just above, e.g.

        //     <timestamp>   862  2402 D NetworkMonitor/NetworkAgentInfo [WIFI () - 100]: ...
@@ -335,7 +333,6 @@ public class NetworkMonitor extends StateMachine { 
        mDependencies = deps;

        mNonPrivateDnsBypassNetwork = network;

        mNetwork = deps.getPrivateDnsBypassNetwork(network);

        mNetId = mNetwork.netId;

        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -471,7 +468,7 @@ public class NetworkMonitor extends StateMachine { 


    @Override

    protected void log(String s) {

        if (DBG) Log.d(TAG + "/" + mNetwork.netId, s);

        if (DBG) Log.d(TAG + "/" + mNetwork.toString(), s);

    }



    private void validationLog(int probeType, Object url, String msg) {
@@ -795,7 +792,7 @@ public class NetworkMonitor extends StateMachine { 
        CustomIntentReceiver(String action, int token, int what) {

            mToken = token;

            mWhat = what;

            mAction = action + "_" + mNetId + "_" + token;

            mAction = action + "_" + mNetwork.getNetworkHandle() + "_" + token;

            mContext.registerReceiver(this, new IntentFilter(mAction));

        }

        public PendingIntent getPendingIntent() {
@@ -1088,11 +1085,6 @@ public class NetworkMonitor extends StateMachine { 
        return mDependencies.getSetting(mContext, Settings.Global.CAPTIVE_PORTAL_USE_HTTPS, 1) == 1;

    }



    private boolean getWifiScansAlwaysAvailableDisabled() {

        return mDependencies.getSetting(

                mContext, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 0;

    }



    private String getCaptivePortalServerHttpsUrl() {

        return mDependencies.getSetting(mContext,

                Settings.Global.CAPTIVE_PORTAL_HTTPS_URL, DEFAULT_HTTPS_URL);
@@ -1484,7 +1476,7 @@ public class NetworkMonitor extends StateMachine { 
     */

    private void sendNetworkConditionsBroadcast(boolean responseReceived, boolean isCaptivePortal,

            long requestTimestampMs, long responseTimestampMs) {

        if (getWifiScansAlwaysAvailableDisabled()) {

        if (!mWifiManager.isScanAlwaysAvailable()) {

            return;

        }
@@ -1568,7 +1560,7 @@ public class NetworkMonitor extends StateMachine { 


    private void logNetworkEvent(int evtype) {

        int[] transports = mNetworkCapabilities.getTransportTypes();

        mMetricsLog.log(mNetId, transports, new NetworkEvent(evtype));

        mMetricsLog.log(mNetwork, transports, new NetworkEvent(evtype));

    }



    private int networkEventType(ValidationStage s, EvaluationResult r) {
@@ -1590,7 +1582,8 @@ public class NetworkMonitor extends StateMachine { 
    private void maybeLogEvaluationResult(int evtype) {

        if (mEvaluationTimer.isRunning()) {

            int[] transports = mNetworkCapabilities.getTransportTypes();

            mMetricsLog.log(mNetId, transports, new NetworkEvent(evtype, mEvaluationTimer.stop()));

            mMetricsLog.log(mNetwork, transports,

                    new NetworkEvent(evtype, mEvaluationTimer.stop()));

            mEvaluationTimer.reset();

        }

    }
@@ -1603,7 +1596,7 @@ public class NetworkMonitor extends StateMachine { 
                .setReturnCode(probeResult)

                .setDurationMs(durationMs)

                .build();

        mMetricsLog.log(mNetId, transports, ev);

        mMetricsLog.log(mNetwork, transports, ev);

    }



    @VisibleForTesting
@@ -1743,7 +1736,7 @@ public class NetworkMonitor extends StateMachine { 
        boolean result = false;

        // Reevaluation will generate traffic. Thus, set a minimal reevaluation timer to limit the

        // possible traffic cost in metered network.

        if (mNetworkCapabilities.isMetered()

        if (!mNetworkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED)

                && (SystemClock.elapsedRealtime() - getLastProbeTime()

                < mDataStallMinEvaluateTime)) {

            return false;