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

Commit 4d9020ef authored by Ken Chen's avatar Ken Chen
Browse files

[DO NOT MERGE] Revert "Reference unreachable netId from INetd" 

This reverts commit 601eb978.

Reason for revert: Automerge conflict on sc-dev. The target file has been moved to other folder in sc-dev (ag/14516148). Revert this change and check-in again from AOSP bases on aosp/1706845.

Change-Id: I93a8bf4a3f59d789d88adceb3760c586b9951750
parent 601eb978

services/core/java/com/android/server/ConnectivityService.java

+3 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // arguments like the handler or the DnsResolver.

        // TODO : remove this ; it is probably better handled with a sentinel request.

        mNoServiceNetwork = new NetworkAgentInfo(null,

                new Network(INetd.UNREACHABLE_NET_ID),

                new Network(NO_SERVICE_NET_ID),

                new NetworkInfo(TYPE_NONE, 0, "", ""),

                new LinkProperties(), new NetworkCapabilities(),

                new NetworkScore.Builder().setLegacyInt(0).build(), mContext, null,
@@ -6433,6 +6433,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    // Request used to optionally keep vehicle internal network always active

    private final NetworkRequest mDefaultVehicleRequest;



    // TODO replace with INetd.UNREACHABLE_NET_ID when available.

    private static final int NO_SERVICE_NET_ID = 52;

    // Sentinel NAI used to direct apps with default networks that should have no connectivity to a

    // network with no service. This NAI should never be matched against, nor should any public API

    // ever return the associated network. For this reason, this NAI is not in the list of available