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

Commit bc1a1013 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Update connectivity namespace definition 

Since DeviceConfig is available in aosp, update the definition
reference from DeviceConfig instead of local definition.

Bug: 120013793
Test: atest NetworkStackTests
Change-Id: I3da82bd822ec340b98ad0b683478bd14ae94693c
parent fbb796b3

src/android/net/dhcp/DhcpClient.java

+3 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static android.net.dhcp.DhcpPacket.INADDR_BROADCAST; 
import static android.net.dhcp.DhcpPacket.INFINITE_LEASE;

import static android.net.util.NetworkStackUtils.closeSocketQuietly;

import static android.net.util.SocketUtils.makePacketSocketAddress;

import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY;

import static android.system.OsConstants.AF_INET;

import static android.system.OsConstants.AF_PACKET;

import static android.system.OsConstants.ETH_P_IP;
@@ -361,7 +362,7 @@ public class DhcpClient extends StateMachine { 
     *

     */

    public boolean isDhcpLeaseCacheEnabled() {

        return mDependencies.getBooleanDeviceConfig(NetworkStackUtils.NAMESPACE_CONNECTIVITY,

        return mDependencies.getBooleanDeviceConfig(NAMESPACE_CONNECTIVITY,

                NetworkStackUtils.DHCP_INIT_REBOOT_ENABLED);

    }
@@ -369,7 +370,7 @@ public class DhcpClient extends StateMachine { 
     * check whether or not to support DHCP Rapid Commit option.

     */

    public boolean isDhcpRapidCommitEnabled() {

        return mDependencies.getBooleanDeviceConfig(NetworkStackUtils.NAMESPACE_CONNECTIVITY,

        return mDependencies.getBooleanDeviceConfig(NAMESPACE_CONNECTIVITY,

                NetworkStackUtils.DHCP_RAPID_COMMIT_ENABLED);

    }

src/android/net/util/NetworkStackUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ import java.util.function.Predicate; 
 * Collection of utilities for the network stack.

 */

public class NetworkStackUtils {

    // TODO: Refer to DeviceConfig definition.

    public static final String NAMESPACE_CONNECTIVITY = "connectivity";



    /**

     * A list of captive portal detection specifications used in addition to the fallback URLs.

     * Each spec has the format url@@/@@statusCodeRegex@@/@@contentRegex. Specs are separated

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

+1 −1
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_MODE_PROMPT; 
import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_FALLBACK_URLS;

import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USER_AGENT;

import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;

import static android.net.util.NetworkStackUtils.NAMESPACE_CONNECTIVITY;

import static android.net.util.NetworkStackUtils.isEmpty;

import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY;



import static com.android.networkstack.util.DnsUtils.PRIVATE_DNS_PROBE_HOST_SUFFIX;

import static com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG;