Trigger a support dialog when an action is disabled by policy

Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
2016-01-15 12:20:46 +00:00
parent ae7e15b730
commit ef550767b0
6 changed files with 80 additions and 38 deletions
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -273,10 +273,8 @@ public class AccountSyncSettings extends AccountPreferenceBase {
        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
                getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS,
                mUserHandle.getIdentifier());
-        if (admin != null) {
-            RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
-                    removeAccount, admin);
-        }
+        RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
+                removeAccount, admin);
        syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
        syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |