diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
index 238b719b542..2de271c2cd5 100644
--- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
@@ -37,8 +37,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
 public class AddDevicePreferenceController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop {
 
-    private static final String KEY = "add_bt_devices";
-
     private Preference mPreference;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -49,8 +47,8 @@ public class AddDevicePreferenceController extends BasePreferenceController
     private IntentFilter mIntentFilter;
     private BluetoothAdapter mBluetoothAdapter;
 
-    public AddDevicePreferenceController(Context context) {
-        super(context, KEY);
+    public AddDevicePreferenceController(Context context, String key) {
+        super(context, key);
         mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
@@ -80,11 +78,6 @@ public class AddDevicePreferenceController extends BasePreferenceController
                 : DISABLED_UNSUPPORTED;
     }
 
-    @Override
-    public String getPreferenceKey() {
-        return KEY;
-    }
-
     @Override
     public CharSequence getSummary() {
         return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
index 5fcc50aedd9..15872d1957f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
@@ -73,7 +73,8 @@ public class AddDevicePreferenceControllerTest {
                 mContext.getPackageManager());
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
 
-        mAddDevicePreferenceController = new AddDevicePreferenceController(mContext);
+        mAddDevicePreferenceController = new AddDevicePreferenceController(mContext,
+                "add_bt_devices");
         ReflectionHelpers.setField(mAddDevicePreferenceController,
                 "mBluetoothAdapter", mBluetoothAdapter);