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

Merge "Update AccountRestrictionHelper in master"

Browse Source
This commit is contained in:
Alex Johnston
2020-03-04 09:51:50 +00:00
committed by Android (Google) Code Review
parent 2aba7874d5 f2c7cbc92b
commit be527a0049
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ public class AccountRestrictionHelper {
return; return;
} }
if (hasBaseUserRestriction(userRestriction, userId)) { if (hasBaseUserRestriction(userRestriction, userId)) {
if (isDisallowRemoveManagedProfileRestriction(userRestriction) if (userRestriction.equals(DISALLOW_REMOVE_MANAGED_PROFILE)
&& isOrganizationOwnedDevice()) { && isOrganizationOwnedDevice()) {
preference.setDisabledByAdmin(getEnforcedAdmin(userRestriction, userId)); preference.setDisabledByAdmin(getEnforcedAdmin(userRestriction, userId));
} else { } else {
@@ -69,10 +69,6 @@ public class AccountRestrictionHelper {
userId); userId);
} }
private boolean isDisallowRemoveManagedProfileRestriction(String userRestriction) {
return userRestriction.equals(DISALLOW_REMOVE_MANAGED_PROFILE);
}
private boolean isOrganizationOwnedDevice() { private boolean isOrganizationOwnedDevice() {
final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService( final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE); Context.DEVICE_POLICY_SERVICE);
@@ -85,7 +81,7 @@ public class AccountRestrictionHelper {
private EnforcedAdmin getEnforcedAdmin(String userRestriction, int userId) { private EnforcedAdmin getEnforcedAdmin(String userRestriction, int userId) {
final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService( final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE); Context.DEVICE_POLICY_SERVICE);
if (dpm != null) { if (dpm == null) {
return null; return null;
} }
final int managedUsedId = getManagedUserId(userId); final int managedUsedId = getManagedUserId(userId);