Jaikumar Ganesh 20c8f47330 resolved conflicts for merge of 0522f5e9 to master ...

Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2

2010-09-13 14:57:59 -07:00

..

AtCommandHandler.java

BluetoothHeadset.java:

2010-08-13 15:23:00 -07:00

AtCommandResult.java

…

AtParser.java

…

BluetoothA2dp.java

Use UNDEFINED priorities when unpaired.

2009-12-11 12:00:31 -08:00

BluetoothAdapter.java

Out Of Band API for Secure Simple Pairing.

2010-09-13 11:40:21 -07:00

BluetoothAssignedNumbers.java

BluetoothHeadset.java:

2010-08-13 15:23:00 -07:00

BluetoothAudioGateway.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

BluetoothClass.java

Add Tethering class bit check.

2010-08-23 11:50:32 -07:00

BluetoothDevice.aidl

Bluetooth: API change.

2009-08-18 08:24:22 -07:00

BluetoothDevice.java

Out Of Band API for Secure Simple Pairing.

2010-09-13 11:40:21 -07:00

BluetoothDevicePicker.java

bluetooth tethering

2010-08-18 15:07:50 -07:00

BluetoothDeviceProfileState.java

Add HID to the state machine and add native call backs.

2010-07-21 10:43:02 -07:00

BluetoothHeadset.java

Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT

2010-08-26 16:03:40 -07:00

BluetoothInputDevice.java

HID profile.

2010-06-17 13:49:25 -07:00

BluetoothInputStream.java

Immediately destroy BluetoothSocket's on close().

2009-09-02 11:51:35 -07:00

BluetoothOutputStream.java

Immediately destroy BluetoothSocket's on close().

2009-09-02 11:51:35 -07:00

BluetoothPan.java

Decouple Tethering UI with registering of SDP records.

2010-09-02 14:34:40 -07:00

BluetoothPbap.java

API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.

2009-09-10 18:52:21 -07:00

BluetoothProfileState.java

Add HID to the state machine and add native call backs.

2010-07-21 10:43:02 -07:00

BluetoothServerSocket.java

docs for ESR: add docs to bluetooth explainin that discovery should

2009-11-19 17:06:54 -08:00

BluetoothSocket.java

docs for ESR: add docs to bluetooth explainin that discovery should

2009-11-19 17:06:54 -08:00

BluetoothUuid.java

Add BNEP_SVC UUID for incoming tethering connections.

2010-08-23 18:32:03 -07:00

HeadsetBase.java

BluetoothHeadset.java:

2010-08-13 15:23:00 -07:00

IBluetooth.aidl

resolved conflicts for merge of 0522f5e9 to master

2010-09-13 14:57:59 -07:00

IBluetoothA2dp.aidl

Add a new state machine for handling the incoming / outgoing profile

2010-06-02 16:03:45 -07:00

IBluetoothCallback.aidl

Encourage developers to connect RFCOMM by UUID instead of Channel.

2009-10-07 23:25:24 +02:00

IBluetoothHeadset.aidl

Pass BluetoothDevice to the Bluetooth Headset calls.

2010-06-02 16:03:51 -07:00

IBluetoothPbap.aidl

Bluetooth: API change.

2009-08-18 08:24:22 -07:00

package.html

docs: update the Bluetooth guide with links to the sample

2009-12-16 18:48:02 -08:00