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

Commit 40d44785 authored by Paul Hu's avatar Paul Hu Committed by Android (Google) Code Review
Browse files

Merge "Move collect_vpn_metrics flag to android_core_networking namespace" into main

parents 19933aeb 75335437

core/java/android/net/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -61,3 +61,11 @@ flag { 
  description: "Flag for moving the socket destroy logic in Netd to the Connectivity service"

  bug: "314961091"

}



flag {

    name: "collect_vpn_metrics"

    namespace: "android_core_networking"

    is_exported: false

    description: "This flag controls VPN metrics collection."

    bug: "306313287"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_AUTO; 
import static android.net.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static android.os.PowerWhitelistManager.REASON_VPN;

import static android.os.UserHandle.PER_USER_RANGE;

import static android.net.platform.flags.Flags.collectVpnMetrics;

import static android.telephony.CarrierConfigManager.KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_PREFERRED_IKE_PROTOCOL_INT;



import static com.android.net.module.util.NetworkStackConstants.IPV6_MIN_MTU;

import static com.android.server.connectivity.Flags.collectVpnMetrics;



import static java.util.Objects.requireNonNull;

services/core/java/com/android/server/connectivity/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -14,10 +14,3 @@ flag { 
    description: "This flag controls if airplane mode sync between phones and watches are enabled."

    bug: "414622391"

}
 


flag {

    name: "collect_vpn_metrics"

    namespace: "android_core_networking"

    description: "This flag controls VPN metrics collection."

    bug: "306313287"

}
 
 No newline at end of file

services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java

+1 −1
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ import static android.net.ipsec.ike.IkeSessionParams.ESP_ENCAP_TYPE_UDP; 
import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_AUTO;

import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_IPV4;

import static android.net.ipsec.ike.IkeSessionParams.ESP_IP_VERSION_IPV6;

import static android.net.platform.flags.Flags.FLAG_COLLECT_VPN_METRICS;

import static android.os.UserHandle.PER_USER_RANGE;

import static android.telephony.CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_PREFERRED_IKE_PROTOCOL_INT;



import static com.android.net.module.util.NetworkStackConstants.IPV6_MIN_MTU;

import static com.android.server.connectivity.Flags.FLAG_COLLECT_VPN_METRICS;

import static com.android.server.connectivity.Vpn.AUTOMATIC_KEEPALIVE_DELAY_SECONDS;

import static com.android.server.connectivity.Vpn.DEFAULT_LONG_LIVED_TCP_CONNS_EXPENSIVE_TIMEOUT_SEC;

import static com.android.server.connectivity.Vpn.DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;