Merge "Remove aconfig flags for Connectivity FlaggedAPI annotations" into aosp-main-future (771b0b47) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+8 −6

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ aconfig_srcjars = [
		":android.media.playback.flags-aconfig-java{.generated_srcjars}",
		":android.media.tv.flags-aconfig-java{.generated_srcjars}",
		":android.multiuser.flags-aconfig-java{.generated_srcjars}",
		":android.net.platform.flags-aconfig-java{.generated_srcjars}",
		":android.net.vcn.flags-aconfig-java{.generated_srcjars}",
		":android.nfc.flags-aconfig-java{.generated_srcjars}",
		":android.os.flags-aconfig-java{.generated_srcjars}",
		@@ -63,7 +64,6 @@ aconfig_srcjars = [
		":com.android.input.flags-aconfig-java{.generated_srcjars}",
		":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",
		":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
		":com.android.net.flags-aconfig-java{.generated_srcjars}",
		":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",
		":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",
		":com.android.text.flags-aconfig-java{.generated_srcjars}",
		@@ -88,6 +88,7 @@ stubs_defaults {
		"android.crashrecovery.flags-aconfig",
		"android.hardware.biometrics.flags-aconfig",
		"android.media.playback.flags-aconfig",
		"android.net.platform.flags-aconfig",
		"android.net.vcn.flags-aconfig",
		"android.nfc.flags-aconfig",
		"android.os.flags-aconfig",
		@@ -96,7 +97,6 @@ stubs_defaults {
		"com.android.hardware.input.input-aconfig",
		"com.android.window.flags.window-aconfig",
		"com.android.text.flags-aconfig",
		"com.android.net.flags-aconfig",
		],
		}

		@@ -688,9 +688,10 @@ java_aconfig_library {

		// Networking
		aconfig_declarations {
		name: "com.android.net.flags-aconfig",
		package: "com.android.net.flags",
		name: "android.net.platform.flags-aconfig",
		package: "android.net.platform.flags",
		srcs: ["core/java/android/net/flags.aconfig"],
		visibility: [":__subpackages__"],
		}

		// Thread network
		@@ -701,9 +702,10 @@ aconfig_declarations {
		}

		java_aconfig_library {
		name: "com.android.net.flags-aconfig-java",
		aconfig_declarations: "com.android.net.flags-aconfig",
		name: "android.net.platform.flags-aconfig-java",
		aconfig_declarations: "android.net.platform.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		visibility: [":__subpackages__"],
		}

		java_aconfig_library {

core/java/android/net/flags.aconfig

+4 −43

Original line number	Diff line number	Diff line
		package: "com.android.net.flags"
		package: "android.net.platform.flags"

		flag {
		name: "track_multiple_network_activities"
		namespace: "android_core_networking"
		description: "NetworkActivityTracker tracks multiple networks including non default networks"
		bug: "267870186"
		}

		flag {
		name: "forbidden_capability"
		namespace: "android_core_networking"
		description: "This flag controls the forbidden capability API"
		bug: "302997505"
		}

		flag {
		name: "set_data_saver_via_cm"
		namespace: "android_core_networking"
		description: "Set data saver through ConnectivityManager API"
		bug: "297836825"
		}

		flag {
		name: "support_is_uid_networking_blocked"
		namespace: "android_core_networking"
		description: "This flag controls whether isUidNetworkingBlocked is supported"
		bug: "297836825"
		}

		flag {
		name: "basic_background_restrictions_enabled"
		namespace: "android_core_networking"
		description: "Block network access for apps in a low importance background state"
		bug: "304347838"
		}

		flag {
		name: "register_nsd_offload_engine"
		namespace: "android_core_networking"
		description: "The flag controls the access for registerOffloadEngine API in NsdManager"
		bug: "294777050"
		}
		# This file contains aconfig flags used from platform code
		# Flags used for module APIs must be in aconfig files under each modules

		flag {
		name: "ipsec_transform_state"
		namespace: "android_core_networking_ipsec"
		namespace: "core_networking_ipsec"
		description: "The flag controls the access for getIpSecTransformState and IpSecTransformState"
		bug: "308011229"
		}

services/core/java/com/android/server/vcn/VcnContext.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ public class VcnContext {
		@NonNull private final Looper mLooper;
		@NonNull private final VcnNetworkProvider mVcnNetworkProvider;
		@NonNull private final FeatureFlags mFeatureFlags;
		@NonNull private final com.android.net.flags.FeatureFlags mCoreNetFeatureFlags;
		@NonNull private final android.net.platform.flags.FeatureFlags mCoreNetFeatureFlags;
		private final boolean mIsInTestMode;

		public VcnContext(
		@@ -49,7 +49,7 @@ public class VcnContext {

		// Auto-generated class
		mFeatureFlags = new FeatureFlagsImpl();
		mCoreNetFeatureFlags = new com.android.net.flags.FeatureFlagsImpl();
		mCoreNetFeatureFlags = new android.net.platform.flags.FeatureFlagsImpl();
		}

		@NonNull

tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public abstract class NetworkEvaluationTestBase {
		@Mock protected Context mContext;
		@Mock protected Network mNetwork;
		@Mock protected FeatureFlags mFeatureFlags;
		@Mock protected com.android.net.flags.FeatureFlags mCoreNetFeatureFlags;
		@Mock protected android.net.platform.flags.FeatureFlags mCoreNetFeatureFlags;
		@Mock protected TelephonySubscriptionSnapshot mSubscriptionSnapshot;
		@Mock protected TelephonyManager mTelephonyManager;
		@Mock protected IPowerManager mPowerManagerService;