Revert "Disable multiuser toggle on COPE device and add explanat..."
Revert submission 25262217-fix_mu_for_cope
Reason for revert: This issue requires a different approach to the solution.
Reverted changes: /q/submissionid:25262217-fix_mu_for_cope
Change-Id: Ic16676a15278b944ab2a3a6535032c37e5ece624
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
index e77964c..03d1cda 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
@@ -243,32 +243,6 @@
}
/**
- * Checks whether add user is disabled on the device
- *
- * @param context {@link Context} for the calling user.
- *
- *
- * @param userId User to check enforced admin status for.
- *
- * @return EnforcedAdmin Object containing the enforced admin component and admin user details,
- * or {@code null} If adding user is not disabled.
- */
- public static EnforcedAdmin checkIfAddUserDisallowed(Context context, int userId) {
- final UserManager um = UserManager.get(context);
- if (!um.hasUserRestriction(UserManager.DISALLOW_ADD_USER, UserHandle.of(userId))) {
- // Restriction is not enforced.
- return null;
- }
- EnforcedAdmin enforcedAdmin = checkIfRestrictionEnforced(context,
- UserManager.DISALLOW_ADD_USER, userId);
- if (enforcedAdmin != null) {
- return enforcedAdmin;
- }
- return EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(
- UserManager.DISALLOW_ADD_USER);
- }
-
- /**
* Check if an application is suspended.
*
* @return EnforcedAdmin Object containing the enforced admin component and admin user details,
