Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev (23657458) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -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();

+8 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*