commit 9f06c870229b00cdd19224cb12c4202de65772ae
author Prathmesh Prabhu <pprabhu@chromium.org> Thu Nov 21 14:08:23 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 05 07:46:51 2013 +0000
tree 840c0431e552916635ade61cda1203c6778d8c32
parent eadf89f62c747f0b4caff74df37e821e419f68e9

shill: Consolidate Cellular DBus properties in the Cellular class.

BUG=chromium:321854
TEST=(1) Run platform2 unittests.
     (2) Run network_3g, network_ui, network3g_pseudomodem suite on 3G, LTE, and
         CDMA modems.

Change-Id: I5717c5de8597f8bfac15b3947f455c6e44344929
Reviewed-on: https://chromium-review.googlesource.com/177700
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular_capability_universal_cdma.cc

diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index f51892f..c6cae61 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -107,7 +107,7 @@
   }
   PendingActivationStore::State state =
       modem_info()->pending_activation_store()->GetActivationState(
-          PendingActivationStore::kIdentifierMEID, meid());
+          PendingActivationStore::kIdentifierMEID, cellular()->meid());
   if (state == PendingActivationStore::kStatePending) {
     SLOG(Cellular, 2) << "There's already a pending activation. Ignoring.";
     return;
@@ -122,7 +122,7 @@
   // during OTA activation.
   modem_info()->pending_activation_store()->SetActivationState(
       PendingActivationStore::kIdentifierMEID,
-      meid(),
+      cellular()->meid(),
       PendingActivationStore::kStatePending);
 
   // Initiate OTA activation.
@@ -141,12 +141,12 @@
   if (IsActivated()) {
     SLOG(Cellular, 3) << "CDMA service activated. Clear store.";
     modem_info()->pending_activation_store()->RemoveEntry(
-        PendingActivationStore::kIdentifierMEID, meid());
+        PendingActivationStore::kIdentifierMEID, cellular()->meid());
     return;
   }
   PendingActivationStore::State state =
       modem_info()->pending_activation_store()->GetActivationState(
-          PendingActivationStore::kIdentifierMEID, meid());
+          PendingActivationStore::kIdentifierMEID, cellular()->meid());
   if (IsActivating() && state != PendingActivationStore::kStateFailureRetry) {
     SLOG(Cellular, 3) << "OTA activation in progress. Nothing to do.";
     return;
@@ -252,10 +252,10 @@
   CellularService::OLP olp;
   olp.CopyFrom(*result);
   string post_data = olp.GetPostData();
-  ReplaceSubstringsAfterOffset(&post_data, 0, "${esn}", esn());
+  ReplaceSubstringsAfterOffset(&post_data, 0, "${esn}", cellular()->esn());
   ReplaceSubstringsAfterOffset(&post_data, 0, "${mdn}",
                                GetMdnForOLP(*cellular_operator));
-  ReplaceSubstringsAfterOffset(&post_data, 0, "${meid}", meid());
+  ReplaceSubstringsAfterOffset(&post_data, 0, "${meid}", cellular()->meid());
   ReplaceSubstringsAfterOffset(&post_data, 0, "${oem}", "GOG2");
   olp.SetPostData(post_data);
   if (cellular()->service().get())
@@ -356,9 +356,9 @@
 
   string value;
   if (DBusProperties::GetString(status_changes, "mdn", &value))
-    set_mdn(value);
+    cellular()->set_mdn(value);
   if (DBusProperties::GetString(status_changes, "min", &value))
-    set_min(value);
+    cellular()->set_min(value);
 
   SLOG(Cellular, 2) << "Activation state: "
                     << GetActivationStateString(activation_state_);
@@ -375,13 +375,13 @@
     LOG(INFO) << "Activation completed successfully.";
     modem_info()->pending_activation_store()->SetActivationState(
         PendingActivationStore::kIdentifierMEID,
-        meid(),
+        cellular()->meid(),
         PendingActivationStore::kStateActivated);
   } else {
     LOG(ERROR) << "Activation failed with error: " << error;
     modem_info()->pending_activation_store()->SetActivationState(
         PendingActivationStore::kIdentifierMEID,
-        meid(),
+        cellular()->meid(),
         PendingActivationStore::kStateFailureRetry);
   }
   UpdatePendingActivationState();
@@ -457,7 +457,7 @@
 bool CellularCapabilityUniversalCDMA::IsActivating() const {
   PendingActivationStore::State state =
       modem_info()->pending_activation_store()->GetActivationState(
-          PendingActivationStore::kIdentifierMEID, meid());
+          PendingActivationStore::kIdentifierMEID, cellular()->meid());
   return (state == PendingActivationStore::kStatePending) ||
       (state == PendingActivationStore::kStateFailureRetry) ||
       (activation_state_ == MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING);
@@ -558,11 +558,11 @@
   if (DBusProperties::GetString(properties,
                                 MM_MODEM_MODEMCDMA_PROPERTY_MEID,
                                 &str_value))
-    set_meid(str_value);
+    cellular()->set_meid(str_value);
   if (DBusProperties::GetString(properties,
                                 MM_MODEM_MODEMCDMA_PROPERTY_ESN,
                                 &str_value))
-    set_esn(str_value);
+    cellular()->set_esn(str_value);
 
   uint32_t sid = sid_;
   uint32_t nid = nid_;