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

Commit 2893302a authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Call preference.setEnabled only after updating disabledByAdmin state. 

We check the value of disabledByAdmin state in setEnabled, so update it
first before calling setEnabled.

Bug: 27642236
Change-Id: Ie6c805b85a3afb87ffdaad0b80dbadc172b62d49
parent 76001741

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