shill: cellular: Updating serving operator should update service name.
CellularCapabilityUniversalCDMA::UpdateServingOperator should update the
service name.
BUG=chromium:264937
TEST=1. Build and run unit tests.
2. Start pseudomodem in CDMA mode. Running "connectivity show services"
should display "Test Network" as the value for "Name" and not a generic
name such as "CDMANetwork0"
Change-Id: I5fcad7528d8de8870befee513ec79d0a2133a801
Reviewed-on: https://gerrit.chromium.org/gerrit/63513
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Arman Uguray <armansito@chromium.org>
Tested-by: Arman Uguray <armansito@chromium.org>
diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index af148bd..925956e 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -318,6 +318,7 @@
SLOG(Cellular, 2) << __func__;
if (cellular()->service().get()) {
cellular()->service()->SetServingOperator(cellular()->home_provider());
+ cellular()->service()->SetFriendlyName(CreateFriendlyServiceName());
}
}
diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index 371b09b..f296814 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -282,7 +282,6 @@
EXPECT_EQ("", capability_->provider_.GetCountry());
EXPECT_TRUE(capability_->activation_code_.empty());
-
capability_->UpdateOperatorInfo();
EXPECT_EQ("", capability_->provider_.GetCode());
EXPECT_EQ("", capability_->provider_.GetName());
@@ -321,6 +320,10 @@
EXPECT_EQ("Test", capability_->provider_.GetName());
EXPECT_EQ("us", capability_->provider_.GetCountry());
EXPECT_EQ("1234", capability_->activation_code_);
+ EXPECT_EQ("1", cellular_->service()->serving_operator().GetCode());
+ EXPECT_EQ("Test", cellular_->service()->serving_operator().GetName());
+ EXPECT_EQ("us", cellular_->service()->serving_operator().GetCountry());
+ EXPECT_EQ("Test", cellular_->service()->friendly_name());
}
TEST_F(CellularCapabilityUniversalCDMAMainTest, CreateFriendlyServiceName) {