SettingsLib: Always update preference state.
In case a RestrictedPreference can also be disabled
for other reasons than device admin, the state
of RestrictedPreferenceHelper may not be up-to-date
with the actual preference state. For example, the
"Android Beam" checkbox can be disabled by device
policy, but it can also be disabled by Settings itself
because NFC was turned off by the user.
To fix that, always update the Preference state.
Bug: 26907006
Change-Id: I27cde70beb82721dd4d423943a9898e022df8862
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
index 227b1e8..b96d025 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -159,9 +159,9 @@
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;