diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index dc1802929a8a2..ceaf17ee62074 100755
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1246,10 +1246,8 @@ public final class BluetoothAdapter {
      * @hide
      */
     public boolean enableNoAutoConnect() {
-        try {
-            return mService.enableNoAutoConnect();
-        } catch (RemoteException e) {Log.e(TAG, "", e);}
-        return false;
+        // TODO avoid auto-connect in the new stack.
+        return enable();
     }
 
     /**