diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
index a1ee149f441..8e6df8ee6d9 100644
--- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
@@ -38,11 +38,6 @@ public class BluetoothAbsoluteVolumePreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY;
diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
index 54d2dd4c51e..cd2915fc58f 100644
--- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
@@ -38,11 +38,6 @@ public class BluetoothDeviceNoNamePreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY;
diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
index 44a2ecd19e4..16a549e9123 100644
--- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
@@ -37,11 +37,6 @@ public class BluetoothSnoopLogPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return PREFERENCE_KEY;
diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
index b53b1cd1258..080c92167e7 100644
--- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
+++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
@@ -39,11 +39,6 @@ public class DebugViewAttributesPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return DEBUG_VIEW_ATTRIBUTES_KEY;
diff --git a/src/com/android/settings/development/DeveloperOptionsPreferenceController.java b/src/com/android/settings/development/DeveloperOptionsPreferenceController.java
index 2f1f2540ed0..431d9998071 100644
--- a/src/com/android/settings/development/DeveloperOptionsPreferenceController.java
+++ b/src/com/android/settings/development/DeveloperOptionsPreferenceController.java
@@ -51,6 +51,16 @@ public abstract class DeveloperOptionsPreferenceController extends
         return false;
     }
 
+    /**
+     * Child classes should override this method to create custom logic for hiding preferences.
+     *
+     * @return true if the preference is to be displayed.
+     */
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
     /**
      * Called when developer options is enabled
      */
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
index a1bfa906981..4bd7d8cf9ee 100644
--- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
@@ -43,11 +43,6 @@ public class DisableAutomaticUpdatesPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return OTA_DISABLE_AUTOMATIC_UPDATE_KEY;
diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
index 7f8cdc64400..a98bf20b3f2 100644
--- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
@@ -39,11 +39,6 @@ public class MobileDataAlwaysOnPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return MOBILE_DATA_ALWAYS_ON;
diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java
index 5d0b5d99f1e..55c8feea532 100644
--- a/src/com/android/settings/development/PointerLocationPreferenceController.java
+++ b/src/com/android/settings/development/PointerLocationPreferenceController.java
@@ -39,11 +39,6 @@ public class PointerLocationPreferenceController extends DeveloperOptionsPrefere
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return POINTER_LOCATION_KEY;
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
index c1f04f2186e..162fe6d83a3 100644
--- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -48,11 +48,6 @@ public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferen
         mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return DEBUG_APP_KEY;
diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
index 5656aa00dbd..4270e0076b1 100644
--- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
@@ -50,11 +50,6 @@ public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPref
         mSurfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return SHOW_SCREEN_UPDATES_KEY;
diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java
index ccfcbfa7919..6ac9c7e2e3b 100644
--- a/src/com/android/settings/development/ShowTapsPreferenceController.java
+++ b/src/com/android/settings/development/ShowTapsPreferenceController.java
@@ -39,11 +39,6 @@ public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceCont
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return SHOW_TOUCHES_KEY;
diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java
index ecbb9d0b576..8e0d38ca88b 100644
--- a/src/com/android/settings/development/StayAwakePreferenceController.java
+++ b/src/com/android/settings/development/StayAwakePreferenceController.java
@@ -61,11 +61,6 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
         }
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return PREFERENCE_KEY;
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
index f638f311324..c54fc5bc6be 100644
--- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
@@ -41,11 +41,6 @@ public class TetheringHardwareAccelPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return TETHERING_HARDWARE_OFFLOAD;
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
index 5e7dfa24dfa..2ca887afd9b 100644
--- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -48,11 +48,6 @@ public class WaitForDebuggerPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return WAIT_FOR_DEBUGGER_KEY;
diff --git a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
index 1eb62505e7f..007d7d0406c 100644
--- a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
+++ b/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
@@ -42,11 +42,6 @@ public class WifiAggressiveHandoverPreferenceController extends
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return WIFI_AGGRESSIVE_HANDOVER_KEY;
diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
index 009bf9cdf9c..399d6d8f3a1 100644
--- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
+++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
@@ -40,11 +40,6 @@ public class WifiDisplayCertificationPreferenceController extends
         super(context);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return WIFI_DISPLAY_CERTIFICATION_KEY;
diff --git a/src/com/android/settings/development/WifiRoamScansPreferenceController.java b/src/com/android/settings/development/WifiRoamScansPreferenceController.java
index b7ab5b7befb..e9d2fd4798f 100644
--- a/src/com/android/settings/development/WifiRoamScansPreferenceController.java
+++ b/src/com/android/settings/development/WifiRoamScansPreferenceController.java
@@ -42,11 +42,6 @@ public class WifiRoamScansPreferenceController extends
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY;
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
index 4904996b147..4a05d840441 100644
--- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -42,11 +42,6 @@ public class WifiVerboseLoggingPreferenceController extends
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
     @Override
     public String getPreferenceKey() {
         return WIFI_VERBOSE_LOGGING_KEY;