diff options
| author | Martijn Coenen <maco@google.com> | 2016-03-09 10:30:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-09 10:30:40 +0000 |
| commit | 502bc4e7a340b75829afdd85803005fe3dacbb88 (patch) | |
| tree | 2634ef87ed14e5ded9f6094baabd03d116c3b8b9 /packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java | |
| parent | 8710347fd96bc26c7f7760a261d8e889baf53ba2 (diff) | |
| parent | 6f02f56f52248a3129da6072ed692591cc1074f6 (diff) | |
Merge "SettingsLib: Always update preference state." into nyc-dev
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 0c0af243ff7b..bace4c04d705 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java @@ -155,9 +155,9 @@ public class RestrictedPreferenceHelper { public boolean setDisabledByAdmin(EnforcedAdmin admin) { final boolean disabled = (admin != null ? true : false); mEnforcedAdmin = (disabled ? admin : null); + mPreference.setEnabled(!disabled); if (mDisabledByAdmin != disabled) { mDisabledByAdmin = disabled; - mPreference.setEnabled(!disabled); return true; } return false; |