Merge "SettingsLib: Always update preference state." into nyc-dev

2016-03-09 10:30:39 +00:00
parent 8710347fd9 6f02f56f52
commit 502bc4e7a3
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -155,9 +155,9 @@ public class RestrictedPreferenceHelper {
    public boolean setDisabledByAdmin(EnforcedAdmin admin) {
        final boolean disabled = (admin != null ? true : false);
        mEnforcedAdmin = (disabled ? admin : null);
+        mPreference.setEnabled(!disabled);
        if (mDisabledByAdmin != disabled) {
            mDisabledByAdmin = disabled;
-            mPreference.setEnabled(!disabled);
            return true;
        }
        return false;