Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew Xie
2013-08-20 19:47:29 +00:00
committed by Android (Google) Code Review
parent fd95299415 48f8b5dbf6
commit 2365745855
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -5014,7 +5014,8 @@ package android.bluetooth {
} }
public final class BluetoothGatt implements android.bluetooth.BluetoothProfile { 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 boolean beginReliableWrite();
method public void close(); method public void close();
method public boolean connect(); method public boolean connect();

9
core/java/android/bluetooth/BluetoothGatt.java
View File

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