From 8d774b752b4f8f9ff64c23b02ec923508fe25068 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 8 Mar 2016 17:48:04 -0800
Subject: [PATCH] Minor cleanup in
 RestrictedPreferenceHelper.setDisabledByAdmin.

Change-Id: I573ea3a0c4565c62d47c4458b7885a8cfbdf31cc
---
 .../src/com/android/settingslib/RestrictedPreferenceHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
index 62c213ac1313e..47023c108eab8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -145,7 +145,7 @@ public class RestrictedPreferenceHelper {
      */
     public boolean setDisabledByAdmin(EnforcedAdmin admin) {
         final boolean disabled = (admin != null ? true : false);
-        mEnforcedAdmin = (disabled ? admin : null);
+        mEnforcedAdmin = admin;
         mPreference.setEnabled(!disabled);
         if (mDisabledByAdmin != disabled) {
             mDisabledByAdmin = disabled;