Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bd0b80a authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

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

am: 502bc4e7

* commit '502bc4e7':
  SettingsLib: Always update preference state.
parents 138d4b4c 502bc4e7

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -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;