From 48f8b5dbf6d387002abee1ec0da73446d2aab0df Mon Sep 17 00:00:00 2001 From: John Du Date: Mon, 19 Aug 2013 12:20:37 -0700 Subject: Change abortReliableWrite(BluetoothDevice) to abortReliableWrite() BluetoothGatt.abortReliableWrite() should not take a BluetoothDevice parameter. Instead, it should use mDevice instance variable. bug 10152994 Change-Id: I7fc79b9011cf878414128cc9f1696e5ccc597056 --- api/current.txt | 3 ++- core/java/android/bluetooth/BluetoothGatt.java | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 22e3517ddb84..03871d24d38c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index a8c310bd3e2d..86224e0306e8 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -1102,7 +1102,7 @@ public final class BluetoothGatt implements BluetoothProfile { * *

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. * -- cgit v1.2.3-59-g8ed1b