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

Commit f3721239 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Call preference.setEnabled only after updating disabledByAdmin state."... 

Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev am: 13e22319
am: a58b0bb9

* commit 'a58b0bb9':
  Call preference.setEnabled only after updating disabledByAdmin state.
parents 3eb68556 a58b0bb9

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

+4 −3
Original line number Diff line number Diff line
@@ -146,12 +146,13 @@ public class RestrictedPreferenceHelper { 
    public boolean setDisabledByAdmin(EnforcedAdmin admin) {

        final boolean disabled = (admin != null ? true : false);

        mEnforcedAdmin = admin;

        mPreference.setEnabled(!disabled);

        boolean changed = false;

        if (mDisabledByAdmin != disabled) {

            mDisabledByAdmin = disabled;

            return true;

            changed = true;

        }

        return false;

        mPreference.setEnabled(!disabled);

        return changed;

    }



    public boolean isDisabledByAdmin() {