Marie Janssen 5c7ef9ccc7 resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d ...

am: 2f94877c01

Change-Id: I00f1e604816bd95b4ecc3063209e38780a4e8675

2016-12-15 00:27:08 +00:00

..

le

Bluetooth: report proper advertiser status on error

2016-11-22 13:38:15 -08:00

BluetoothA2dp.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothA2dpSink.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothActivityEnergyInfo.aidl

…

BluetoothActivityEnergyInfo.java

…

BluetoothAdapter.java

resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp

2016-12-14 13:44:28 -08:00

BluetoothAssignedNumbers.java

…

BluetoothAudioConfig.aidl

…

BluetoothAudioConfig.java

…

BluetoothAvrcp.java

…

BluetoothAvrcpController.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothAvrcpPlayerSettings.aidl

…

BluetoothAvrcpPlayerSettings.java

…

BluetoothClass.java

…

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 "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 am: 61d0088923

2016-10-28 03:24:38 +00:00

BluetoothGattCallback.java

…

BluetoothGattCharacteristic.aidl

…

BluetoothGattCharacteristic.java

…

BluetoothGattDescriptor.aidl

…

BluetoothGattDescriptor.java

…

BluetoothGattIncludedService.aidl

…

BluetoothGattIncludedService.java

…

BluetoothGattServer.java

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

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

BluetoothGattServerCallback.java

…

BluetoothGattService.aidl

…

BluetoothGattService.java

…

BluetoothHeadset.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothHeadsetClient.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothHeadsetClientCall.aidl

…

BluetoothHeadsetClientCall.java

Use UUIDs for call management in Headset Client (HF)

2016-10-28 18:16:53 +00:00

BluetoothHealth.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothHealthAppConfiguration.aidl

…

BluetoothHealthAppConfiguration.java

Prevent NPE if someone creates a bad BluetoothHealthAppConfig object

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

BluetoothHealthCallback.java

…

BluetoothInputDevice.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothInputStream.java

…

BluetoothManager.java

Remove unused mContext from BluetoothGatt[Server].

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

BluetoothMap.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothMapClient.java

MAP MCE

2016-11-01 17:39:16 -07:00

BluetoothMasInstance.java

…

BluetoothOutputStream.java

…

BluetoothPan.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothPbap.java

…

BluetoothPbapClient.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothProfile.java

MAP MCE

2016-11-01 17:39:16 -07:00

BluetoothSap.java

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

BluetoothServerSocket.java

…

BluetoothSocket.java

…

BluetoothUuid.java

Add helper method to convert Bluetooth UUID to bytes

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

IBluetooth.aidl

Bluetooth: advertising improvements

2016-11-11 23:28:32 +00:00

IBluetoothA2dp.aidl

…

IBluetoothA2dpSink.aidl

…

IBluetoothAvrcpController.aidl

Remove APIs that are not directly usable.

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

IBluetoothCallback.aidl

…

IBluetoothGatt.aidl

Separate LE scanner from GATT client (1/4)

2016-10-27 23:09:35 +00:00

IBluetoothGattCallback.aidl

Separate LE scanner from GATT client (1/4)

2016-10-27 23:09:35 +00:00

IBluetoothGattServerCallback.aidl

Separate LE scanner from GATT client (1/4)

2016-10-27 23:09:35 +00:00

IBluetoothHeadset.aidl

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

IBluetoothHeadsetClient.aidl

Use UUIDs for call management in Headset Client (HF)

2016-10-28 18:16:53 +00:00

IBluetoothHeadsetPhone.aidl

…

IBluetoothHealth.aidl

…

IBluetoothHealthCallback.aidl

…

IBluetoothInputDevice.aidl

…

IBluetoothManager.aidl

DO NOT MERGE Add Bluetooth toggle prompts - framework

2016-12-12 09:50:24 -08:00

IBluetoothManagerCallback.aidl

…

IBluetoothMap.aidl

…

IBluetoothMapClient.aidl

MAP MCE

2016-11-01 17:39:16 -07:00

IBluetoothPan.aidl

…

IBluetoothPbap.aidl

…

IBluetoothPbapClient.aidl

…

IBluetoothProfileServiceConnection.aidl

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

IBluetoothSap.aidl

…

IBluetoothStateChangeCallback.aidl

Detect non-oneway calls leaving system_server.

2016-11-07 17:03:37 -07:00

OobData.aidl

…

OobData.java

BLE OOB Pairing - parse address type (5/5)

2016-11-10 19:51:49 +00:00

package.html

…

SdpMasRecord.java

…

SdpMnsRecord.java

…

SdpOppOpsRecord.java

…

SdpPseRecord.java

…

SdpRecord.java

…

SdpSapsRecord.java

…

UidTraffic.java

…