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

Commit 9b4c9ccf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Creating flags to update the system restrictions admin dialog and... 

Merge "Creating flags to update the system restrictions admin dialog and restrict factory reset for supervision." into main
parents 170c6493 347fe313

core/java/android/app/supervision/flags.aconfig

+14 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ flag { 
  bug: "401576820"

}





flag {

  name: "persistent_supervision_settings"

  is_exported: false
@@ -97,3 +96,17 @@ flag { 
  description: "Saves supervision user data and recovery info into a binary xml file"

  bug: "406449915"

}



flag {

  name: "update_supervision_admin_dialog"

  namespace: "supervision"

  description: "Updates the supervision admin dialog customizations to be compatible with device supervision"

  bug: "399481325"

}



flag {

  name: "restrict_factory_reset"

  namespace: "supervision"

  description: "Enable restricting factory reset when device supervision is enabled and a supervision PIN recovery method is set"

  bug: "383624414"

}