shill: cellular: Move remaining properties from Capability* to Cellular.
This CL moves the following properties from Capability* to the Cellular class.
- kIccidProperty [from CellularCapabilityUniversal]: Although cromo backed
CellularCapabilityGSM still does not populate this property, it is better
placed in the cellular device as it opens up the way to move related logic
out of CellularCapabilityUniversal.
- kSupportedCarriersProperty [from CellularCapabilityClassic]
- kPRLVersionProperty [from CellularCapabilityCDMA]
BUG=chromium:322750
TEST=(1) FEATURES=test emerge-link platform2
On the following modems (gobi3k-cdma, gobi3k-gsm, e362, a CDMA dongle),
(2) Make sure properties show up sensibly
(3) Make sure network_3GIdentifiers, network_3GModemControl pass
CQ-DEPEND=CL:184728
Change-Id: I649711e47ae2d79ee9a8fd5235d4b083afd9697f
Reviewed-on: https://chromium-review.googlesource.com/182943
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/cellular_capability_cdma.cc b/cellular_capability_cdma.cc
index 113a4eb..5e49386 100644
--- a/cellular_capability_cdma.cc
+++ b/cellular_capability_cdma.cc
@@ -36,11 +36,8 @@
activation_starting_(false),
activation_state_(MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED),
registration_state_evdo_(MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN),
- registration_state_1x_(MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN),
- prl_version_(0) {
+ registration_state_1x_(MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN) {
SLOG(Cellular, 2) << "Cellular capability constructed: CDMA";
- PropertyStore *store = cellular->mutable_store();
- store->RegisterConstUint16(kPRLVersionProperty, &prl_version_);
}
void CellularCapabilityCDMA::InitProxies() {
@@ -108,9 +105,12 @@
oper.SetCountry("us");
cellular()->set_home_provider(oper);
}
+
+ uint16 prl_version;
DBusProperties::GetUint32(
properties, "activation_state", &activation_state_);
- DBusProperties::GetUint16(properties, "prl_version", &prl_version_);
+ if (DBusProperties::GetUint16(properties, "prl_version", &prl_version))
+ cellular()->set_prl_version(prl_version);
// TODO(petkov): For now, get the payment and usage URLs from ModemManager to
// match flimflam. In the future, get these from an alternative source (e.g.,
// database, carrier-specific properties, etc.).