diff --git a/packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java b/packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java
index aeda7ac5d0863..9aa511d610f2a 100644
--- a/packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java
+++ b/packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java
@@ -93,10 +93,10 @@ public class ActionButtonsPreference extends Preference {
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-        if (!BuildCompat.isAtLeastS()) {
-            holder.setDividerAllowedAbove(true);
-            holder.setDividerAllowedBelow(true);
-        }
+
+        final boolean allowedDivider = !BuildCompat.isAtLeastS();
+        holder.setDividerAllowedAbove(allowedDivider);
+        holder.setDividerAllowedBelow(allowedDivider);
 
         mButton1Info.mButton = (Button) holder.findViewById(R.id.button1);
         mButton2Info.mButton = (Button) holder.findViewById(R.id.button2);