summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-08-20 19:47:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-20 19:47:29 +0000
commit2365745855ac4725949ebe9bae72fdc0613bb94f (patch)
treecfe95b6df93af06d6dcf0ae1e7ff22d51a21e1ba /core/java/android
parentfd95299415b0d013ee3c8b79e1398cb85cfa684f (diff)
parent48f8b5dbf6d387002abee1ec0da73446d2aab0df (diff)
downloadframeworks_base-2365745855ac4725949ebe9bae72fdc0613bb94f.zip
frameworks_base-2365745855ac4725949ebe9bae72fdc0613bb94f.tar.gz
frameworks_base-2365745855ac4725949ebe9bae72fdc0613bb94f.tar.bz2
Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/BluetoothGatt.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java
index a8c310b..86224e0 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 {
*
* <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;
@@ -1114,6 +1114,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.
*
* <p>Once notifications are enabled for a characteristic, a