[fshost] Use fidl::WireSharedClient
fidl::Client is deprecated. Since the client is not bound on the
dispatcher thread, fidl::WireSharedClient is the appropriate
replacement here.
Bug: 81147
Test: fx test isolated-devmgr-tests fshost-tests
Change-Id: I5db41ed7061d3fddffb1a23385deb8dbe824ffad
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/559603
Fuchsia-Auto-Submit: Yifei Teng <yifeit@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: David Gilhooley <dgilhooley@google.com>
Reviewed-by: Stephen Demos <sdemos@google.com>
diff --git a/src/storage/fshost/fs-manager.cc b/src/storage/fshost/fs-manager.cc
index f872669..f2cf1ed 100644
--- a/src/storage/fshost/fs-manager.cc
+++ b/src/storage/fshost/fs-manager.cc
@@ -75,8 +75,7 @@
zx_status_t FsManager::SetupLifecycleServer(
fidl::ServerEnd<fuchsia_process_lifecycle::Lifecycle> lifecycle_request) {
- return LifecycleServer::Create(global_loop_->dispatcher(), this,
- std::move(lifecycle_request));
+ return LifecycleServer::Create(global_loop_->dispatcher(), this, std::move(lifecycle_request));
}
// Sets up the outgoing directory, and runs it on the PA_DIRECTORY_REQUEST
@@ -200,8 +199,8 @@
}
}
if (driver_admin.is_valid()) {
- driver_admin_ = fidl::Client<fuchsia_device_manager::Administrator>(std::move(driver_admin),
- global_loop_->dispatcher());
+ driver_admin_ = fidl::WireSharedClient<fuchsia_device_manager::Administrator>(
+ std::move(driver_admin), global_loop_->dispatcher());
}
return ZX_OK;
}
diff --git a/src/storage/fshost/fs-manager.h b/src/storage/fshost/fs-manager.h
index ccc4f69..11156a7 100644
--- a/src/storage/fshost/fs-manager.h
+++ b/src/storage/fshost/fs-manager.h
@@ -170,7 +170,7 @@
std::mutex lock_;
bool shutdown_called_ TA_GUARDED(lock_) = false;
sync_completion_t shutdown_;
- fidl::Client<fuchsia_device_manager::Administrator> driver_admin_;
+ fidl::WireSharedClient<fuchsia_device_manager::Administrator> driver_admin_;
};
} // namespace fshost
