Merge "Add feature flag for coexistence migration for supervision" into main

1 files changed, 8 insertions, 2 deletions

diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
index 0319c75e830d..e940a7bb96ad 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.aconfig
@@ -89,6 +89,14 @@ flag {
   bug: "289520697"
 }
 
+flag {
+  name: "coexistence_migration_for_supervision_enabled"
+  is_exported: true
+  namespace: "enterprise"
+  description: "Migrate existing APIs that are used by supervision (Kids Module) to be coexistable."
+  bug: "356894721"
+}
+
 # Fully rolled out and must not be used.
 flag {
   name: "security_log_v2_enabled"
@@ -123,7 +131,6 @@ flag {
   bug: "293441361"
 }
 
-# Fully rolled out and must not be used.
 flag {
   name: "assist_content_user_restriction_enabled"
   is_exported: true
@@ -150,7 +157,6 @@ flag {
   bug: "304999634"
 }
 
-# Fully rolled out and must not be used.
 flag {
   name: "esim_management_enabled"
   is_exported: true