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

Unified Diff: device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc

Issue 2051333004: Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error on windows Created 4 years, 4 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
Index: device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
index fd93ccc8e3321a26f33161ff17b62cbed6b0b2fc..0e8cfd8d845fc67a3f063834938832e018522dea 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
@@ -15,7 +15,6 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "device/bluetooth/bluetooth_adapter_android.h"
-#include "device/bluetooth/bluetooth_gatt_notify_session_android.h"
#include "device/bluetooth/bluetooth_remote_gatt_descriptor_android.h"
#include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
#include "jni/ChromeBluetoothRemoteGattCharacteristic_jni.h"
@@ -53,11 +52,6 @@ BluetoothRemoteGattCharacteristicAndroid::
~BluetoothRemoteGattCharacteristicAndroid() {
Java_ChromeBluetoothRemoteGattCharacteristic_onBluetoothRemoteGattCharacteristicAndroidDestruction(
AttachCurrentThread(), j_characteristic_);
-
- if (pending_start_notify_calls_.size()) {
- OnStartNotifySessionError(
- device::BluetoothRemoteGattService::GATT_ERROR_FAILED);
- }
}
// static
@@ -103,11 +97,6 @@ BluetoothRemoteGattCharacteristicAndroid::GetPermissions() const {
return 0;
}
-bool BluetoothRemoteGattCharacteristicAndroid::IsNotifying() const {
- NOTIMPLEMENTED();
- return false;
-}
-
std::vector<BluetoothRemoteGattDescriptor*>
BluetoothRemoteGattCharacteristicAndroid::GetDescriptors() const {
EnsureDescriptorsCreated();
@@ -127,68 +116,6 @@ BluetoothRemoteGattCharacteristicAndroid::GetDescriptor(
return iter->second;
}
-void BluetoothRemoteGattCharacteristicAndroid::StartNotifySession(
- const NotifySessionCallback& callback,
- const ErrorCallback& error_callback) {
- if (!pending_start_notify_calls_.empty()) {
- pending_start_notify_calls_.push_back(
- std::make_pair(callback, error_callback));
- return;
- }
-
- Properties properties = GetProperties();
-
- bool hasNotify = properties & PROPERTY_NOTIFY;
- bool hasIndicate = properties & PROPERTY_INDICATE;
-
- if (!hasNotify && !hasIndicate) {
- LOG(ERROR) << "Characteristic needs NOTIFY or INDICATE";
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(error_callback,
- BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED));
- return;
- }
-
- std::vector<BluetoothRemoteGattDescriptor*> ccc_descriptor =
- GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
- ClientCharacteristicConfigurationUuid());
-
- if (ccc_descriptor.size() != 1u) {
- LOG(ERROR) << "Found " << ccc_descriptor.size()
- << " client characteristic configuration descriptors.";
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(error_callback,
- (ccc_descriptor.size() == 0)
- ? BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED
- : BluetoothRemoteGattService::GATT_ERROR_FAILED));
- return;
- }
-
- if (!Java_ChromeBluetoothRemoteGattCharacteristic_setCharacteristicNotification(
- AttachCurrentThread(), j_characteristic_, true)) {
- LOG(ERROR) << "Error enabling characteristic notification";
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(error_callback,
- BluetoothRemoteGattService::GATT_ERROR_FAILED));
- return;
- }
-
- std::vector<uint8_t> value(2);
- value[0] = hasNotify ? 1 : 2;
-
- pending_start_notify_calls_.push_back(
- std::make_pair(callback, error_callback));
- ccc_descriptor[0]->WriteRemoteDescriptor(
- value, base::Bind(&BluetoothRemoteGattCharacteristicAndroid::
- OnStartNotifySessionSuccess,
- base::Unretained(this)),
- base::Bind(
- &BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionError,
- base::Unretained(this)));
-}
-
void BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristic(
const ValueCallback& callback,
const ErrorCallback& error_callback) {
@@ -248,27 +175,6 @@ void BluetoothRemoteGattCharacteristicAndroid::OnChanged(
adapter_->NotifyGattCharacteristicValueChanged(this, value_);
}
-void BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionSuccess() {
- std::vector<PendingStartNotifyCall> reentrant_safe_callbacks;
- reentrant_safe_callbacks.swap(pending_start_notify_calls_);
-
- for (const auto& callback_pair : reentrant_safe_callbacks) {
- std::unique_ptr<device::BluetoothGattNotifySession> notify_session(
- new BluetoothGattNotifySessionAndroid(instance_id_));
- callback_pair.first.Run(std::move(notify_session));
- }
-}
-
-void BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionError(
- BluetoothRemoteGattService::GattErrorCode error) {
- std::vector<PendingStartNotifyCall> reentrant_safe_callbacks;
- reentrant_safe_callbacks.swap(pending_start_notify_calls_);
-
- for (auto const& callback_pair : reentrant_safe_callbacks) {
- callback_pair.second.Run(error);
- }
-}
-
void BluetoothRemoteGattCharacteristicAndroid::OnRead(
JNIEnv* env,
const JavaParamRef<jobject>& jcaller,
@@ -334,6 +240,46 @@ void BluetoothRemoteGattCharacteristicAndroid::CreateGattRemoteDescriptor(
chrome_bluetooth_device));
}
+void BluetoothRemoteGattCharacteristicAndroid::SubscribeToNotifications(
+ BluetoothRemoteGattDescriptor* ccc_descriptor,
+ const base::Closure& callback,
+ const ErrorCallback& error_callback) {
+ if (!Java_ChromeBluetoothRemoteGattCharacteristic_setCharacteristicNotification(
+ AttachCurrentThread(), j_characteristic_.obj(), true)) {
+ LOG(ERROR) << "Error enabling characteristic notification";
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(error_callback,
+ BluetoothRemoteGattService::GATT_ERROR_FAILED));
+ return;
+ }
+
+ bool hasNotify = GetProperties() & PROPERTY_NOTIFY;
+ std::vector<uint8_t> value(2);
+ value[0] = hasNotify ? 1 : 2;
+
+ ccc_descriptor->WriteRemoteDescriptor(value, callback, error_callback);
+}
+
+void BluetoothRemoteGattCharacteristicAndroid::UnsubscribeFromNotifications(
+ BluetoothRemoteGattDescriptor* ccc_descriptor,
+ const base::Closure& callback,
+ const ErrorCallback& error_callback) {
+ if (!Java_ChromeBluetoothRemoteGattCharacteristic_setCharacteristicNotification(
+ AttachCurrentThread(), j_characteristic_.obj(), false)) {
+ LOG(ERROR) << "Error disabling characteristic notification";
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::Bind(error_callback,
+ device::BluetoothRemoteGattService::GATT_ERROR_FAILED));
+ return;
+ }
+
+ std::vector<uint8_t> value(2);
+ value[0] = 0;
+
+ ccc_descriptor->WriteRemoteDescriptor(value, callback, error_callback);
+}
+
BluetoothRemoteGattCharacteristicAndroid::
BluetoothRemoteGattCharacteristicAndroid(
BluetoothAdapterAndroid* adapter,

Powered by Google App Engine
This is Rietveld 408576698