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

Remove onConnectionCongested callback

Browse Source 
Bug:17289507

Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
This commit is contained in:
Prerepa Viswanadham
2014-09-11 13:39:16 -07:00
parent c46cd62b5c
commit ba4f57a1c6
5 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -6391,7 +6391,6 @@ package android.bluetooth {
method public void onCharacteristicChanged(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic);
method public void onCharacteristicRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
method public void onCharacteristicWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
method public void onConnectionCongested(android.bluetooth.BluetoothGatt, boolean);
method public void onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int);
method public void onDescriptorRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
method public void onDescriptorWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
@@ -6491,7 +6490,6 @@ package android.bluetooth {
ctor public BluetoothGattServerCallback();
method public void onCharacteristicReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattCharacteristic);
method public void onCharacteristicWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattCharacteristic, boolean, boolean, int, byte[]);
method public void onConnectionCongested(android.bluetooth.BluetoothDevice, boolean);
method public void onConnectionStateChange(android.bluetooth.BluetoothDevice, int, int);
method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);
method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);

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

@@ -51,6 +51,7 @@ public final class BluetoothGatt implements BluetoothProfile {
private int mConnState;
private final Object mStateLock = new Object();
private Boolean mDeviceBusy = false;
private Boolean mIsCongested = false;
private int mTransport;
private static final int CONN_STATE_IDLE = 0;
@@ -616,7 +617,7 @@ public final class BluetoothGatt implements BluetoothProfile {
+ " congested=" + congested);
if (!address.equals(mDevice.getAddress())) return;
try {
mCallback.onConnectionCongested(BluetoothGatt.this, congested);
mIsCongested = congested;
} catch (Exception ex) {
Log.w(TAG, "Unhandled exception in callback", ex);
}

14
core/java/android/bluetooth/BluetoothGattCallback.java
View File

@@ -152,18 +152,4 @@ public abstract class BluetoothGattCallback {
*/
public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
}
/**
* Callback indicating that a remote device connection congestestion status has changed.
*
* An application should refrain from sending additional data to a remote device when
* a callback is received with the congested flag set to true. Once the congestion status
* is cleared up, the application will receive an additional callback with the congested
* flag set to false.
*
* @param gatt The GATT client associated with the remote device
* @param congested true, if the connection is currently congested
*/
public void onConnectionCongested(BluetoothGatt gatt, boolean congested) {
}
}

3
core/java/android/bluetooth/BluetoothGattServer.java
View File

@@ -48,6 +48,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
private BluetoothAdapter mAdapter;
private IBluetoothGatt mService;
private BluetoothGattServerCallback mCallback;
private Boolean mIsCongested = false;
private Object mServerIfLock = new Object();
private int mServerIf;
@@ -297,7 +298,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
if (device == null) return;
try {
mCallback.onConnectionCongested(device, congested);
mIsCongested = congested;
} catch (Exception ex) {
Log.w(TAG, "Unhandled exception in callback", ex);
}

14
core/java/android/bluetooth/BluetoothGattServerCallback.java
View File

@@ -145,18 +145,4 @@ public abstract class BluetoothGattServerCallback {
*/
public void onNotificationSent(BluetoothDevice device, int status) {
}
/**
* Callback indicating that a remote device connection congestestion status has changed.
*
* An application should refrain from sending additional data (notifications, indications
* etc.) to a remote device when a callback is received with the congested flag set
* to true. Once the congestion status is cleared up, the application will receive an
* additional callback with the congested flag set to false.
*
* @param device The remote device that triggered the congestion state change
* @param congested true, if the connection is currently congested
*/
public void onConnectionCongested(BluetoothDevice device, boolean congested) {
}
}