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

* commit '1094b7d7699738be3193f5be8c451ea4c85461aa': Bluetooth: fix enableNoAutoConnect() call.
2012-08-03 12:14:45 -07:00
parent 72f2a09430 1094b7d769
commit 64f949e309
1 changed files with 2 additions and 4 deletions
--- 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();
    }

    /**