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

Commit c2259164 authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Disable grant admin option on adding users from lock screen 

Bug: 265447354
Test: manual
Change-Id: I2954421807ef15d63b3190b78946d4beb8244c37
parent e2c44bab

packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java

+8 −2
Original line number Diff line number Diff line
@@ -49,14 +49,16 @@ public class CreateUserActivity extends Activity { 
    /**

     * Creates an intent to start this activity.

     */

    public static Intent createIntentForStart(Context context) {

    public static Intent createIntentForStart(Context context, boolean isKeyguardShowing) {

        Intent intent = new Intent(context, CreateUserActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.putExtra(EXTRA_IS_KEYGUARD_SHOWING, isKeyguardShowing);

        return intent;

    }



    private static final String TAG = "CreateUserActivity";

    private static final String DIALOG_STATE_KEY = "create_user_dialog_state";

    private static final String EXTRA_IS_KEYGUARD_SHOWING = "extra_is_keyguard_showing";



    private final UserCreator mUserCreator;

    private final EditUserInfoController mEditUserInfoController;
@@ -86,7 +88,11 @@ public class CreateUserActivity extends Activity { 
        if (savedInstanceState != null) {

            mEditUserInfoController.onRestoreInstanceState(savedInstanceState);

        }

        if (mUserCreator.isMultipleAdminEnabled()) {

        boolean isKeyguardShowing = getIntent().getBooleanExtra(EXTRA_IS_KEYGUARD_SHOWING, true);

        // Display grant admin dialog only on unlocked device to admin users if multiple admins

        // are allowed on this device.

        if (mUserCreator.isMultipleAdminEnabled() && mUserCreator.isUserAdmin()

                && !isKeyguardShowing) {

            mGrantAdminDialog = buildGrantAdminDialog();

            mGrantAdminDialog.show();

        } else {

packages/SystemUI/src/com/android/systemui/user/UserCreator.kt

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ constructor( 
        userManager.setUserAdmin(userId)

    }



    fun isUserAdmin(): Boolean {

        return userManager.isAdminUser

    }



    fun isMultipleAdminEnabled(): Boolean {

        return UserManager.isMultipleAdminEnabled()

    }

packages/SystemUI/src/com/android/systemui/user/ui/dialog/AddUserDialog.kt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class AddUserDialog( 
                )



                context.startActivityAsUser(

                    CreateUserActivity.createIntentForStart(context),

                    CreateUserActivity.createIntentForStart(context, isKeyguardShowing),

                    userHandle,

                )

            }