Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev

Author: Martijn Coenen

core/java/android/bluetooth/BluetoothAdapter.java

@@ -1246,10 +1246,8 @@ public void onBluetoothServiceDown() {
      * @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();
     }
 
     /**