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

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

Browse Source
This commit is contained in:
Martijn Coenen
2016-03-09 10:30:39 +00:00
committed by Android (Google) Code Review
parent 8710347fd9 6f02f56f52
commit 502bc4e7a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,9 +155,9 @@ public class RestrictedPreferenceHelper {
public boolean setDisabledByAdmin(EnforcedAdmin admin) { public boolean setDisabledByAdmin(EnforcedAdmin admin) {
final boolean disabled = (admin != null ? true : false); final boolean disabled = (admin != null ? true : false);
mEnforcedAdmin = (disabled ? admin : null); mEnforcedAdmin = (disabled ? admin : null);
mPreference.setEnabled(!disabled);
if (mDisabledByAdmin != disabled) { if (mDisabledByAdmin != disabled) {
mDisabledByAdmin = disabled; mDisabledByAdmin = disabled;
mPreference.setEnabled(!disabled);
return true; return true;
} }
return false; return false;