am 23657458: Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev

* commit '2365745855ac4725949ebe9bae72fdc0613bb94f':
  Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
This commit is contained in:
Matthew Xie
2013-08-20 12:50:38 -07:00
committed by Android Git Automerger
2 changed files with 10 additions and 2 deletions

View File

@@ -5014,7 +5014,8 @@ package android.bluetooth {
}
public final class BluetoothGatt implements android.bluetooth.BluetoothProfile {
method public void abortReliableWrite(android.bluetooth.BluetoothDevice);
method public void abortReliableWrite();
method public deprecated void abortReliableWrite(android.bluetooth.BluetoothDevice);
method public boolean beginReliableWrite();
method public void close();
method public boolean connect();

View File

@@ -1102,7 +1102,7 @@ public final class BluetoothGatt implements BluetoothProfile {
*
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
*/
public void abortReliableWrite(BluetoothDevice mDevice) {
public void abortReliableWrite() {
if (DBG) Log.d(TAG, "abortReliableWrite() - device: " + mDevice.getAddress());
if (mService == null || mClientIf == 0) return;
@@ -1113,6 +1113,13 @@ public final class BluetoothGatt implements BluetoothProfile {
}
}
/**
* @deprecated Use {@link abortReliableWrite()}
*/
public void abortReliableWrite(BluetoothDevice mDevice) {
abortReliableWrite();
}
/**
* Enable or disable notifications/indications for a given characteristic.
*