From 31abe92c3675bbe6e597d191f9662c1196b3ca55 Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Wed, 6 Dec 2023 13:13:59 +0900
Subject: [PATCH] Use flags.aconfig in platform for android networking

flags.aconfig for android networking is under
packages/modules/Connectivity.
But, currently, mainline code should not read trunk stable flag.
To avoid confusion, this CL moves flags.aconfig to platform.

Bug: 315302281
Test: TH
Change-Id: I3a667cfa14d51e481bb4e99301c10319d2600e00
Merged-In: I44c111577643bacb35b532cb156a61d30cfea31a
---
 common/TrunkStable.bp | 10 ---------
 common/flags.aconfig  | 50 -------------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 common/flags.aconfig

diff --git a/common/TrunkStable.bp b/common/TrunkStable.bp
index 56938fcf61..59874c216d 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 0ad1804f40..0000000000
--- 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"
-}