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

Commit 7ca67e0f authored Apr 08, 2024 by Hansen Kurli Committed by Automerger Merge Worker Apr 08, 2024

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

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

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

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

parents bd841d25 05773913

services/core/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -254,6 +254,7 @@ java_library_static {
	"net_flags_lib",		"net_flags_lib",
	"stats_flags_lib",		"stats_flags_lib",
	"core_os_flags_lib",		"core_os_flags_lib",
			"connectivity_flags_lib",
	],		],
	javac_shard_size: 50,		javac_shard_size: 50,
	javacflags: [		javacflags: [

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

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			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

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			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