Merge "Add aconfig flag file" into main am: 5ce65cd53b am: d55acb1c24 am: c2eacc2037
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774212
Change-Id: I47a1c147e260a3b8b846e3e99c682f6089bc886d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/Android.bp b/common/Android.bp
index ff4de11..e10ede8 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -19,6 +19,10 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+// This is a placeholder comment to avoid merge conflicts
+// as the above target may not exist
+// depending on the branch
+
java_library {
name: "connectivity-net-module-utils-bpf",
srcs: [
diff --git a/common/flags.aconfig b/common/flags.aconfig
new file mode 100644
index 0000000..4926503
--- /dev/null
+++ b/common/flags.aconfig
@@ -0,0 +1,8 @@
+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"
+}