Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(917)

Unified Diff: device/bluetooth/bluetooth_device.cc

Issue 2888663002: Revert "bluetooth: bluez: Fixed issue with missing notifications after reconnect." (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_device.h ('k') | device/bluetooth/bluetooth_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device.cc
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc
index 186e7f47cb6316d67d185ac8f5573b1d2e3aca47..49cf01b08a20e36e0e48aebd3d82b4c61fdc00cc 100644
--- a/device/bluetooth/bluetooth_device.cc
+++ b/device/bluetooth/bluetooth_device.cc
@@ -485,11 +485,7 @@ void BluetoothDevice::DidFailToConnectGatt(ConnectErrorCode error) {
create_gatt_connection_error_callbacks_.clear();
}
-void BluetoothDevice::DidDisconnectGatt(bool notifyDeviceChanged) {
- gatt_services_.clear();
- device_uuids_.ClearServiceUUIDs();
- SetGattServicesDiscoveryComplete(false);
-
+void BluetoothDevice::DidDisconnectGatt() {
// Pending calls to connect GATT are not expected, if they were then
// DidFailToConnectGatt should have been called.
DCHECK(create_gatt_connection_error_callbacks_.empty());
@@ -499,8 +495,7 @@ void BluetoothDevice::DidDisconnectGatt(bool notifyDeviceChanged) {
connection->InvalidateConnectionReference();
}
gatt_connections_.clear();
- if (notifyDeviceChanged)
- GetAdapter()->NotifyDeviceChanged(this);
+ GetAdapter()->NotifyDeviceChanged(this);
}
void BluetoothDevice::AddGattConnection(BluetoothGattConnection* connection) {
« no previous file with comments | « device/bluetooth/bluetooth_device.h ('k') | device/bluetooth/bluetooth_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698