Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable grant admin option on adding users from lock screen"

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-01-25 18:32:57 +00:00
committed by Android (Google) Code Review
parent 094d11d352 c225916491
commit 3f35e7b839
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java
View File

@@ -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 {

4
packages/SystemUI/src/com/android/systemui/user/UserCreator.kt
View File

@@ -87,6 +87,10 @@ constructor(
userManager.setUserAdmin(userId)
}
fun isUserAdmin(): Boolean {
return userManager.isAdminUser
}
fun isMultipleAdminEnabled(): Boolean {
return UserManager.isMultipleAdminEnabled()
}

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

@@ -70,7 +70,7 @@ class AddUserDialog(
)
context.startActivityAsUser(
CreateUserActivity.createIntentForStart(context),
CreateUserActivity.createIntentForStart(context, isKeyguardShowing),
userHandle,
)
}