Marie Janssen 1e012d93c7 resolve merge conflicts of 1238daf to master ...

Change-Id: Icc70d291379d4f4816881e46704197513e6d548e

2016-10-26 17:57:22 -07:00

..

le

Separate advertiser from GATT client (1/4)

2016-08-31 03:36:53 -07:00

BluetoothA2dp.java

Guard concurrent accesses to BluetoothA2dp service object

2016-06-22 01:08:03 +00:00

BluetoothA2dpSink.java

Add support for AVRCP 1.3.

2016-01-19 14:37:18 -08:00

BluetoothActivityEnergyInfo.aidl

…

BluetoothActivityEnergyInfo.java

BatteryStats: Introduce Async external stats requests

2016-04-15 15:27:52 -07:00

BluetoothAdapter.java

resolve merge conflicts of 1238daf to master

2016-10-26 17:57:22 -07:00

BluetoothAssignedNumbers.java

…

BluetoothAudioConfig.aidl

…

BluetoothAudioConfig.java

…

BluetoothAvrcp.java

…

BluetoothAvrcpController.java

Remove APIs that are not directly usable.

2016-10-17 12:47:10 -07:00

BluetoothAvrcpPlayerSettings.aidl

Add support for AVRCP 1.3.

2016-01-19 14:37:18 -08:00

BluetoothAvrcpPlayerSettings.java

Add support for AVRCP 1.3.

2016-01-19 14:37:18 -08:00

BluetoothClass.java

Add support for AVRCP 1.3.

2016-01-19 14:37:18 -08:00

BluetoothDevice.aidl

…

BluetoothDevice.java

Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791

2016-10-06 21:12:06 +00:00

BluetoothDevicePicker.java

…

BluetoothGatt.java

Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92 am: 046a5c3a00

2016-10-20 23:20:57 +00:00

BluetoothGattCallback.java

…

BluetoothGattCallbackWrapper.java

Separate advertiser from GATT client (1/4)

2016-08-31 03:36:53 -07:00

BluetoothGattCharacteristic.aidl

Change how services are passed up to the stack

2016-03-21 19:58:27 -07:00

BluetoothGattCharacteristic.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothGattDescriptor.aidl

Change how services are passed up to the stack

2016-03-21 19:58:27 -07:00

BluetoothGattDescriptor.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothGattIncludedService.aidl

Change how services are passed up to the stack

2016-03-21 19:58:27 -07:00

BluetoothGattIncludedService.java

Change how services are passed up to the stack

2016-03-21 19:58:27 -07:00

BluetoothGattServer.java

Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4

2016-09-28 15:44:23 +00:00

BluetoothGattServerCallback.java

…

BluetoothGattService.aidl

Change how services are passed up to the stack

2016-03-21 19:58:27 -07:00

BluetoothGattService.java

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

BluetoothHeadset.java

HFP 1.7 profile update (3/4)

2016-08-03 17:55:04 -07:00

BluetoothHeadsetClient.java

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

BluetoothHeadsetClientCall.aidl

…

BluetoothHeadsetClientCall.java

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

BluetoothHealth.java

…

BluetoothHealthAppConfiguration.aidl

…

BluetoothHealthAppConfiguration.java

Prevent NPE if someone creates a bad BluetoothHealthAppConfig object

2016-09-23 22:08:26 +00:00

BluetoothHealthCallback.java

Annotate some APIs with threading annotations

2015-04-23 22:14:19 +00:00

BluetoothInputDevice.java

…

BluetoothInputStream.java

…

BluetoothManager.java

Remove unused mContext from BluetoothGatt[Server].

2016-09-28 07:09:38 +00:00

BluetoothMap.java

…

BluetoothMasInstance.java

…

BluetoothOutputStream.java

…

BluetoothPan.java

Bluetooth: Fix to avoid framework reboot during monkey testing

2015-06-02 01:23:11 -07:00

BluetoothPbap.java

…

BluetoothPbapClient.java

PBAP client Settings profile.

2016-03-30 12:20:51 -07:00

BluetoothProfile.java

Add a way to query for supported Bluetooth profiles.

2016-10-09 12:54:42 -07:00

BluetoothSap.java

Correct typo in BluetoothSap binder

2016-06-16 21:02:39 +00:00

BluetoothServerSocket.java

Fix links to Bluetooth Guide

2016-06-20 10:26:31 -07:00

BluetoothSocket.java

Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d

2016-06-21 23:40:28 +00:00

BluetoothUuid.java

Add helper method to convert Bluetooth UUID to bytes

2016-10-25 12:30:24 -07:00

IBluetooth.aidl

resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp

2016-10-18 10:07:00 -07:00

IBluetoothA2dp.aidl

…

IBluetoothA2dpSink.aidl

Add support for AVRCP 1.3.

2016-01-19 14:37:18 -08:00

IBluetoothAvrcpController.aidl

Remove APIs that are not directly usable.

2016-10-17 12:47:10 -07:00

IBluetoothCallback.aidl

…

IBluetoothGatt.aidl

Separate advertiser from GATT client (1/4)

2016-08-31 03:36:53 -07:00

IBluetoothGattCallback.aidl

Separate advertiser from GATT client (1/4)

2016-08-31 03:36:53 -07:00

IBluetoothGattServerCallback.aidl

GATT Server refactoring (2/4)

2016-08-02 20:45:06 +00:00

IBluetoothHeadset.aidl

HFP 1.7 profile update (3/4)

2016-08-03 17:55:04 -07:00

IBluetoothHeadsetClient.aidl

Use UUIDs for call management in Headset Client (HF)

2016-06-29 18:58:09 +00:00

IBluetoothHeadsetPhone.aidl

…

IBluetoothHealth.aidl

…

IBluetoothHealthCallback.aidl

…

IBluetoothInputDevice.aidl

…

IBluetoothManager.aidl

Add Bluetooth toggle prompts - framework

2016-07-22 20:40:35 -07:00

IBluetoothManagerCallback.aidl

Make BluetoothManagerCallback oneway to prevent waiting on response

2016-03-19 01:17:47 +00:00

IBluetoothMap.aidl

…

IBluetoothPan.aidl

…

IBluetoothPbap.aidl

…

IBluetoothPbapClient.aidl

PBAP client Settings profile.

2016-03-30 12:20:51 -07:00

IBluetoothProfileServiceConnection.aidl

Change the routing path of bluetooth headset connections.

2014-12-04 16:57:25 +00:00

IBluetoothSap.aidl

Add support for Bluetooth Sim Access Profile (2/4)

2015-04-15 23:45:51 -07:00

IBluetoothStateChangeCallback.aidl

…

OobData.aidl

Implementation of BluetoothDevice.createBondOutOfBand

2016-02-03 16:12:47 -08:00

OobData.java

resolve merge conflicts of 5671277 to stage-aosp-master

2016-08-11 15:53:06 -07:00

package.html

…

SdpMasRecord.java

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

SdpMnsRecord.java

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

SdpOppOpsRecord.java

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

SdpPseRecord.java

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

SdpRecord.java

OBEX Over L2CAP + SDP search API for BT profiles

2015-04-11 01:49:11 +00:00

SdpSapsRecord.java

SAP: Change to use new SDP Api (4/4)

2015-06-03 00:04:37 +00:00

UidTraffic.java

Record bytes transferred for bluetooth

2016-01-18 18:22:55 -08:00