Merge "Add flag for VDM dump_history feature" into main
diff --git a/services/companion/java/com/android/server/companion/virtual/Android.bp b/services/companion/java/com/android/server/companion/virtual/Android.bp
new file mode 100644
index 0000000..50a09b9
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/virtual/Android.bp
@@ -0,0 +1,12 @@
+java_aconfig_library {
+    name: "virtualdevice_flags_lib",
+    aconfig_declarations: "virtualdevice_flags",
+}
+
+aconfig_declarations {
+    name: "virtualdevice_flags",
+    package: "com.android.server.companion.virtual",
+    srcs: [
+        "flags.aconfig",
+    ],
+}
\ No newline at end of file
diff --git a/services/companion/java/com/android/server/companion/virtual/flags.aconfig b/services/companion/java/com/android/server/companion/virtual/flags.aconfig
new file mode 100644
index 0000000..4fe4c87
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/virtual/flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.server.companion.virtual"
+
+flag {
+  name: "dump_history"
+  namespace: "virtual_devices"
+  description: "This flag controls if a history of virtual devices is shown in dumpsys virtualdevices"
+  bug: "293114719"
+}
\ No newline at end of file