Skip to content

Commit

Permalink
[CrOS Bluetooth] Fix service name for debug manager
Browse files Browse the repository at this point in the history
Bluetooth debug is handled through the btdispatch daemon using
org.chromium.Bluetooth service name. However, as btdispatch is going to
be taken out, we need to migrate to bluez with org.bluez as the service
name.

Most of the API calls have been migrated to bluez, but debugging has
not been made ready yet. This CL directly use org.chromium.Bluetooth
for debugging, instead of org.bluez like the rest of the clients. This
needs to be updated when debugging is migrated completely.

BUG=b:145967589

Change-Id: I36da87f1e860ca9c65edc8f984596ded3a711a2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960048
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Commit-Queue: Archie Pusaka <apusaka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727043}
  • Loading branch information
apusaka authored and Commit Bot committed Dec 21, 2019
1 parent e3fecb5 commit 4e8b693
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions device/bluetooth/dbus/bluez_dbus_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ void BluezDBusManager::InitializeClients() {
bluetooth_service_name);
client_bundle_->bluetooth_agent_manager_client()->Init(
GetSystemBus(), bluetooth_service_name);
client_bundle_->bluetooth_debug_manager_client()->Init(
GetSystemBus(), bluetooth_service_name);
client_bundle_->bluetooth_device_client()->Init(GetSystemBus(),
bluetooth_service_name);
client_bundle_->bluetooth_gatt_characteristic_client()->Init(
Expand All @@ -235,6 +233,11 @@ void BluezDBusManager::InitializeClients() {
client_bundle_->bluetooth_profile_manager_client()->Init(
GetSystemBus(), bluetooth_service_name);

// TODO(b/145163508): update service name after migrating BT debug to bluez
client_bundle_->bluetooth_debug_manager_client()->Init(
GetSystemBus(),
bluetooth_object_manager::kBluetoothObjectManagerServiceName);

if (!alternate_bus_)
return;

Expand Down

0 comments on commit 4e8b693

Please sign in to comment.