PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d

Browse Source 
Change-Id: I6d12c929d4fd1c763b6a49d4cfe7b82da5075e5d
This commit is contained in:
Automerger Merge Worker
2020-03-03 09:52:01 +00:00
parent f8139ef988 cf470fab9d
commit b5191ad96a
1 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/com/android/settings/accounts/AccountRestrictionHelper.java
View File

@@ -15,8 +15,17 @@
*/
package com.android.settings.accounts;
import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.annotation.UserIdInt;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -44,7 +53,12 @@ public class AccountRestrictionHelper {
return;
}
if (hasBaseUserRestriction(userRestriction, userId)) {
preference.setEnabled(false);
if (userRestriction.equals(DISALLOW_REMOVE_MANAGED_PROFILE)
&& isOrganizationOwnedDevice()) {
preference.setDisabledByAdmin(getEnforcedAdmin(userRestriction, userId));
} else {
preference.setEnabled(false);
}
} else {
preference.checkRestrictionAndSetDisabled(userRestriction, userId);
}
@@ -55,6 +69,41 @@ public class AccountRestrictionHelper {
userId);
}
private boolean isOrganizationOwnedDevice() {
final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (dpm == null) {
return false;
}
return dpm.isOrganizationOwnedDeviceWithManagedProfile();
}
private EnforcedAdmin getEnforcedAdmin(String userRestriction, int userId) {
final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (dpm == null) {
return null;
}
final int managedUsedId = getManagedUserId(userId);
ComponentName adminComponent = dpm.getProfileOwnerAsUser(managedUsedId);
if (adminComponent != null) {
return new EnforcedAdmin(adminComponent, userRestriction,
UserHandle.of(managedUsedId));
}
return null;
}
private int getManagedUserId(int userId) {
final UserManager um = UserManager.get(mContext);
for (UserInfo ui : um.getProfiles(userId)) {
if (ui.id == userId || !ui.isManagedProfile()) {
continue;
}
return ui.id;
}
return -1;
}
public AccessiblePreferenceCategory createAccessiblePreferenceCategory(Context context) {
return new AccessiblePreferenceCategory(context);
}