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

Commit 13e22319 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev

parents d06fa51e 2893302a

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() {