Merge "Use flags.aconfig in platform for android networking" into main
diff --git a/common/TrunkStable.bp b/common/TrunkStable.bp
index 56938fc..59874c2 100644
--- a/common/TrunkStable.bp
+++ b/common/TrunkStable.bp
@@ -14,13 +14,3 @@
// limitations under the License.
//
-aconfig_declarations {
- name: "com.android.net.flags-aconfig",
- package: "com.android.net.flags",
- srcs: ["flags.aconfig"],
-}
-
-java_aconfig_library {
- name: "connectivity_flags_aconfig_lib",
- aconfig_declarations: "com.android.net.flags-aconfig",
-}
diff --git a/common/flags.aconfig b/common/flags.aconfig
deleted file mode 100644
index 0ad1804..0000000
--- a/common/flags.aconfig
+++ /dev/null
@@ -1,50 +0,0 @@
-package: "com.android.net.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"
-}
-
-flag {
- name: "ipsec_transform_state"
- namespace: "android_core_networking_ipsec"
- description: "The flag controls the access for getIpSecTransformState and IpSecTransformState"
- bug: "308011229"
-}