Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sudheer Shanka
2016-03-14 23:51:12 +00:00
committed by Android (Google) Code Review
parent d06fa51e6b 2893302afc
commit 13e22319e4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
View File

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