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

Merge "Fix tests in UserDetailsSettingsTest and TimeoutToDockUserPreferenceControllerTest" into main

Browse Source
This commit is contained in:
Tetiana Meronyk
2024-06-20 10:34:18 +00:00
committed by Android (Google) Code Review
parent ec59cd0c8b c502ee4540
commit 826b188119
4 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -363,13 +363,12 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
}
if (mUserInfo.isMain() || mUserInfo.isGuest() || !UserManager.isMultipleAdminEnabled()
|| mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_GRANT_ADMIN,
mUserInfo.getUserHandle())) {
mUserInfo.getUserHandle()) || !mUserManager.isAdminUser()) {
removePreference(KEY_GRANT_ADMIN);
}
if (!mUserManager.isAdminUser()) { // non admin users can't remove users and allow calls
removePreference(KEY_ENABLE_TELEPHONY);
removePreference(KEY_REMOVE_USER);
removePreference(KEY_GRANT_ADMIN);
removePreference(KEY_APP_AND_CONTENT_ACCESS);
removePreference(KEY_APP_COPYING);
} else {