Merge "Add flag to add credential authentication before user removal" into main

1 files changed, 10 insertions, 0 deletions

diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig
index 3dbd5b239ae5..fefa8ab8f000 100644
--- a/core/java/android/content/pm/multiuser.aconfig
+++ b/core/java/android/content/pm/multiuser.aconfig
@@ -384,6 +384,16 @@ flag {
   is_fixed_read_only: true
 }
 
+flag {
+    name: "require_pin_before_user_deletion"
+    namespace: "multiuser"
+    description: "Require credential authentication when a user tries to delete themselves or another user"
+    bug: "342395399"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+  }
+}
+
 # This flag guards the private space feature and all its implementations excluding the APIs. APIs are guarded by android.os.Flags.allow_private_profile.
 flag {
     name: "enable_private_space_features"