Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f949e3 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

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

* commit '1094b7d7':
  Bluetooth: fix enableNoAutoConnect() call.
parents 72f2a094 1094b7d7

core/java/android/bluetooth/BluetoothAdapter.java

+2 −4
Original line number Diff line number Diff line
@@ -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();

    }



    /**