commit 13e22319e4d0bf24c3fd08649e180be648f28ad5
author Sudheer Shanka <sudheersai@google.com> Mon Mar 14 23:51:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 14 23:51:13 2016 +0000
tree cd6b8887f5bb7a2c9257b06ab8c825a118b64e99
parent d06fa51e6b974aca0e35e2dc3b693c6a6628dfc5
parent 2893302afc4137e63c9174a5d471d1f18b8b5d87

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

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
index 47023c1..d0aba22 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -146,12 +146,13 @@
     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() {