diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-08-21 17:56:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 17:56:25 +0000 |
| commit | 491cb3f578a23555c807e68f8a536a892959a73f (patch) | |
| tree | 0b3298ef7f55682b7ebf5e23ea6051d381fb25c8 /api | |
| parent | e5d7411744243889916288a1f95edbb8884b7fc4 (diff) | |
| parent | 4072da041da2911dd56635b530b276671ce0199d (diff) | |
| download | frameworks_base-491cb3f578a23555c807e68f8a536a892959a73f.zip frameworks_base-491cb3f578a23555c807e68f8a536a892959a73f.tar.gz frameworks_base-491cb3f578a23555c807e68f8a536a892959a73f.tar.bz2 | |
Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 9a9d5f6..de3723c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6329,7 +6329,6 @@ package android.bluetooth { method public deprecated void abortReliableWrite(android.bluetooth.BluetoothDevice); method public boolean beginReliableWrite(); method public void close(); - method public boolean configureMTU(int); method public boolean connect(); method public void disconnect(); method public boolean discoverServices(); @@ -6343,14 +6342,15 @@ package android.bluetooth { method public boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean readDescriptor(android.bluetooth.BluetoothGattDescriptor); method public boolean readRemoteRssi(); - method public boolean requestConnectionParameterUpdate(int); + method public boolean requestConnectionPriority(int); + method public boolean requestMtu(int); method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean); method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor); - field public static final int GATT_CONNECTION_BALANCED = 0; // 0x0 + field public static final int CONNECTION_PRIORITY_BALANCED = 0; // 0x0 + field public static final int CONNECTION_PRIORITY_HIGH = 1; // 0x1 + field public static final int CONNECTION_PRIORITY_LOW_POWER = 2; // 0x2 field public static final int GATT_CONNECTION_CONGESTED = 143; // 0x8f - field public static final int GATT_CONNECTION_HIGH_PRIORITY = 1; // 0x1 - field public static final int GATT_CONNECTION_LOW_POWER = 2; // 0x2 field public static final int GATT_FAILURE = 257; // 0x101 field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5 field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf @@ -6367,11 +6367,11 @@ package android.bluetooth { method public void onCharacteristicChanged(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic); method public void onCharacteristicRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int); method public void onCharacteristicWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int); - method public void onConfigureMTU(android.bluetooth.BluetoothGatt, int, int); method public void onConnectionCongested(android.bluetooth.BluetoothGatt, boolean); method public void onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int); method public void onDescriptorRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int); method public void onDescriptorWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int); + method public void onMtuChanged(android.bluetooth.BluetoothGatt, int, int); method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int); method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int); method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int); |