From f2c7cbc92bbb9842f4ac686934c910e4c1ed66ea Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Tue, 3 Mar 2020 14:16:28 +0000
Subject: [PATCH] Update AccountRestrictionHelper in master

* In New COPE mode, no explanation was being shown to the
  user as to why the work profile cannot be removed.
* This CL updates AccountRestrictionHelper in master to
  be the same as AccountRestrictionHelper in rvc-dev.

Bug: 149391073
Test: Manual testing
Change-Id: I479e0778e8e426b49d5d9e6e2ee3e6bd44b430e4
---
 .../settings/accounts/AccountRestrictionHelper.java       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/accounts/AccountRestrictionHelper.java b/src/com/android/settings/accounts/AccountRestrictionHelper.java
index 2b80a5f9eab..c67f5d1f9f4 100644
--- a/src/com/android/settings/accounts/AccountRestrictionHelper.java
+++ b/src/com/android/settings/accounts/AccountRestrictionHelper.java
@@ -53,7 +53,7 @@ public class AccountRestrictionHelper {
             return;
         }
         if (hasBaseUserRestriction(userRestriction, userId)) {
-            if (isDisallowRemoveManagedProfileRestriction(userRestriction)
+            if (userRestriction.equals(DISALLOW_REMOVE_MANAGED_PROFILE)
                     && isOrganizationOwnedDevice()) {
                 preference.setDisabledByAdmin(getEnforcedAdmin(userRestriction, userId));
             } else {
@@ -69,10 +69,6 @@ public class AccountRestrictionHelper {
                 userId);
     }
 
-    private boolean isDisallowRemoveManagedProfileRestriction(String userRestriction) {
-        return userRestriction.equals(DISALLOW_REMOVE_MANAGED_PROFILE);
-    }
-
     private boolean isOrganizationOwnedDevice() {
         final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
@@ -85,7 +81,7 @@ public class AccountRestrictionHelper {
     private EnforcedAdmin getEnforcedAdmin(String userRestriction, int userId) {
         final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
-        if (dpm != null) {
+        if (dpm == null) {
             return null;
         }
         final int managedUsedId = getManagedUserId(userId);