commit 0577391348d56f1de3dae508f97bf3537b06b6a8
author Hansen Kurli <hkurli@google.com> Mon Apr 08 07:42:37 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 08 07:42:37 2024 +0000
tree dd07a1c13fdac5fd6dcda94d6cdca0d6fcec1564
parent ec0a9606486ab0f6c7288d6c3f60ff054abb2bd1
parent 0c111009627004c485e75529a6b09da33d9fdb13

Merge "Add feature flag for replace replace_vpn_profile_store" into main am: 0c11100962

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2976993

Change-Id: If3051bea5217ae5fc7dff4e907ddb7d0cc3fd3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/Android.bp

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 267f278..d22427a 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -206,6 +206,7 @@
         "service-jobscheduler-deviceidle.flags-aconfig-java",
         "net_flags_lib",
         "core_os_flags_lib",
+        "connectivity_flags_lib",
     ],
     javac_shard_size: 50,
     javacflags: [

services/core/java/com/android/server/connectivity/Android.bp

diff --git a/services/core/java/com/android/server/connectivity/Android.bp b/services/core/java/com/android/server/connectivity/Android.bp
new file mode 100644
index 0000000..a374ec2
--- /dev/null
+++ b/services/core/java/com/android/server/connectivity/Android.bp
@@ -0,0 +1,10 @@
+aconfig_declarations {
+    name: "connectivity_flags",
+    package: "com.android.server.connectivity",
+    srcs: ["flags.aconfig"],
+}
+
+java_aconfig_library {
+    name: "connectivity_flags_lib",
+    aconfig_declarations: "connectivity_flags",
+}

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

diff --git a/services/core/java/com/android/server/connectivity/flags.aconfig b/services/core/java/com/android/server/connectivity/flags.aconfig
new file mode 100644
index 0000000..32593d4
--- /dev/null
+++ b/services/core/java/com/android/server/connectivity/flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.server.connectivity"
+
+flag {
+    name: "replace_vpn_profile_store"
+    namespace: "android_core_networking"
+    description: "This flag controls the usage of VpnBlobStore to replace LegacyVpnProfileStore."
+    bug: "307903113"
+}
\ No newline at end of file