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

Commit 76d0f17c authored by Kasia Krejszeff's avatar Kasia Krejszeff Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: show_set_screen_lock_dialog" into main

parents a78d3af0 ce66dec4

core/java/android/content/pm/multiuser.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -263,13 +263,6 @@ flag { 
    bug: "321988638"

}



flag {

    name: "show_set_screen_lock_dialog"

    namespace: "profile_experiences"

    description: "Display the dialog to set up screen lock when private space unlock operation is requested"

    bug: "316129700"

}



flag {

    name: "reorder_wallpaper_during_user_switch"

    namespace: "multiuser"

core/java/com/android/internal/app/SetScreenLockDialogActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ public class SetScreenLockDialogActivity extends AlertActivity 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (!(android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.showSetScreenLockDialog()

                && android.multiuser.Flags.enablePrivateSpaceFeatures())) {

            finish();

            return;