diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 91984adf3ad4e..dc59a7ea0a922 100755
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -829,12 +829,10 @@ public final class BluetoothDevice implements Parcelable {
       *               was started.
       */
      public boolean fetchUuidsWithSdp() {
-         //TODO(BT)
-         /*
         try {
-            return sService.fetchRemoteUuids(this, null, null);
-        } catch (RemoteException e) {Log.e(TAG, "", e);}*/
-        return false;
+            return sService.fetchRemoteUuids(this);
+        } catch (RemoteException e) {Log.e(TAG, "", e);}
+            return false;
     }
 
     /** @hide */
diff --git a/core/java/android/bluetooth/IBluetooth.aidl b/core/java/android/bluetooth/IBluetooth.aidl
index e98795440d914..9653de2fdd31c 100644
--- a/core/java/android/bluetooth/IBluetooth.aidl
+++ b/core/java/android/bluetooth/IBluetooth.aidl
@@ -63,9 +63,7 @@ interface IBluetooth
     boolean setRemoteAlias(in BluetoothDevice device, in String name);
     int getRemoteClass(in BluetoothDevice device);
     ParcelUuid[] getRemoteUuids(in BluetoothDevice device);
-    //TODO(BT)
-    //boolean fetchRemoteUuids(in BluetoothDevice device, in ParcelUuid uuid,
-    //    in IBluetoothCallback callback);
+    boolean fetchRemoteUuids(in BluetoothDevice device);
 
     boolean setPin(in BluetoothDevice device, boolean accept, int len, in byte[] pinCode);
     boolean setPasskey(in BluetoothDevice device, boolean accept, int len, in byte[]