Commit b99734b0 authored by Ben Chan's avatar Ben Chan Committed by Commit Bot

chromeos: remove debugd GetModemStatus binding

Support for Gobi modems is deprecated along with daisy. The debugd
GetModemStatus API only works with cromo, which manages only Gobi
modems. The mm-status field provided by the debugd LogTool already
include status information from ModemManager.

This CL removes the modem-status entry under chrome://system and the
corresponding debugd GetModemStatus D-Bus binding.

Bug: 954634
Test: Verify that chrome://system no longer fetches modem-status from debugd.
Change-Id: Id49dc22dfa1c938fc0a5d674a6e9958c52af9297
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1580104
Auto-Submit: Ben Chan <benchan@chromium.org>
Reviewed-by: default avatarDan Erat <derat@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653431}
parent 7435a4ab
......@@ -31,7 +31,6 @@ namespace {
constexpr char kNotAvailable[] = "<not available>";
constexpr char kRoutesKeyName[] = "routes";
constexpr char kNetworkStatusKeyName[] = "network-status";
constexpr char kModemStatusKeyName[] = "modem-status";
// List of user log files that Chrome reads directly as these logs are generated
// by Chrome itself.
......@@ -97,11 +96,6 @@ void DebugDaemonLogSource::Fetch(SysLogsSourceCallback callback) {
kNetworkStatusKeyName));
++num_pending_requests_;
client->GetModemStatus(base::BindOnce(&DebugDaemonLogSource::OnGetOneLog,
weak_ptr_factory_.GetWeakPtr(),
kModemStatusKeyName));
++num_pending_requests_;
if (scrub_) {
client->GetScrubbedBigLogs(base::BindOnce(&DebugDaemonLogSource::OnGetLogs,
weak_ptr_factory_.GetWeakPtr()));
......
......@@ -191,15 +191,6 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
}
void GetModemStatus(DBusMethodCallback<std::string> callback) override {
dbus::MethodCall method_call(debugd::kDebugdInterface,
debugd::kGetModemStatus);
debugdaemon_proxy_->CallMethod(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
base::BindOnce(&DebugDaemonClientImpl::OnStringMethod,
weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
}
void GetNetworkInterfaces(DBusMethodCallback<std::string> callback) override {
dbus::MethodCall method_call(debugd::kDebugdInterface,
debugd::kGetInterfaces);
......
......@@ -63,9 +63,6 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) DebugDaemonClient
// Gets information about network status as json.
virtual void GetNetworkStatus(DBusMethodCallback<std::string> callback) = 0;
// Gets information about modem status as json.
virtual void GetModemStatus(DBusMethodCallback<std::string> callback) = 0;
// Gets information about network interfaces as json.
// For details, please refer to
// http://gerrit.chromium.org/gerrit/#/c/28045/5/src/helpers/netif.cc
......
......@@ -90,12 +90,6 @@ void FakeDebugDaemonClient::GetNetworkStatus(
FROM_HERE, base::BindOnce(std::move(callback), base::nullopt));
}
void FakeDebugDaemonClient::GetModemStatus(
DBusMethodCallback<std::string> callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(callback), base::nullopt));
}
void FakeDebugDaemonClient::GetNetworkInterfaces(
DBusMethodCallback<std::string> callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
......
......@@ -46,7 +46,6 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeDebugDaemonClient
bool ipv6,
DBusMethodCallback<std::vector<std::string>> callback) override;
void GetNetworkStatus(DBusMethodCallback<std::string> callback) override;
void GetModemStatus(DBusMethodCallback<std::string> callback) override;
void GetNetworkInterfaces(DBusMethodCallback<std::string> callback) override;
void GetPerfOutput(base::TimeDelta duration,
const std::vector<std::string>& perf_args,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment