commit 07193fdb601f4cea6301ebb85ebf20596807e126
author Ben Chan <benchan@chromium.org> Fri Jul 12 22:10:55 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Jul 15 18:09:09 2013 -0700
tree 451d433201fa753614515644a85c81610baf6c61
parent 0381f9a7b4c0d27387bae44ea2f3b048fad1830c

shill: cellular: Pass operator-specific MDN to online payment portal.

BUG=chrome-os-partner:20887
TEST=Tested the following:
1. Build and run unit tests.
2. Run `connectivity show services` to verify that the 'Cellular.OlpUrl'
   property of a LTE cellular service includes a 10-digit MDN.
3. Verify that clicking the 'View account' button on the settings page
   of a connected LTE service launches the online account page of the
   mobile carrier.

Change-Id: If7a9660082b3b33812d3f1a0c0f99e01c17265f6
Reviewed-on: https://gerrit.chromium.org/gerrit/61823
Reviewed-by: Arman Uguray <armansito@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

cellular_capability_universal.cc

diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index dee846e..4bbbfcc 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "shill/adaptor_interfaces.h"
-#include "shill/cellular_operator_info.h"
 #include "shill/cellular_service.h"
 #include "shill/dbus_properties_proxy_interface.h"
 #include "shill/error.h"
@@ -75,10 +74,15 @@
     20000;
 unsigned int CellularCapabilityUniversal::friendly_service_name_id_ = 0;
 
+namespace {
 
-static const char kPhoneNumber[] = "*99#";
+const char kPhoneNumber[] = "*99#";
 
-static string AccessTechnologyToString(uint32 access_technologies) {
+// This identifier is specified in the cellular_operator_info file.
+const char kVzwIdentifier[] = "vzw";
+const size_t kVzwMdnLength = 10;
+
+string AccessTechnologyToString(uint32 access_technologies) {
   if (access_technologies & MM_MODEM_ACCESS_TECHNOLOGY_LTE)
     return flimflam::kNetworkTechnologyLte;
   if (access_technologies & (MM_MODEM_ACCESS_TECHNOLOGY_EVDO0 |
@@ -105,7 +109,7 @@
   return "";
 }
 
-static string AccessTechnologyToTechnologyFamily(uint32 access_technologies) {
+string AccessTechnologyToTechnologyFamily(uint32 access_technologies) {
   if (access_technologies & (MM_MODEM_ACCESS_TECHNOLOGY_LTE |
                              MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS |
                              MM_MODEM_ACCESS_TECHNOLOGY_HSPA |
@@ -125,6 +129,8 @@
   return "";
 }
 
+}  // namespace
+
 CellularCapabilityUniversal::CellularCapabilityUniversal(
     Cellular *cellular,
     ProxyFactory *proxy_factory,
@@ -632,6 +638,17 @@
   }
 }
 
+string CellularCapabilityUniversal::GetMdnForOLP(
+    const CellularOperatorInfo::CellularOperator &cellular_operator) const {
+  // TODO(benchan): This is ugly. Remove carrier specific code once we move
+  // mobile activation logic to carrier-specifc extensions (crbug.com/260073).
+  if (cellular_operator.identifier() == kVzwIdentifier &&
+      mdn_.length() > kVzwMdnLength) {
+    return mdn_.substr(mdn_.length() - kVzwMdnLength);
+  }
+  return mdn_;
+}
+
 void CellularCapabilityUniversal::ReleaseProxies() {
   SLOG(Cellular, 2) << __func__;
   modem_3gpp_proxy_.reset();
@@ -967,11 +984,20 @@
 }
 
 void CellularCapabilityUniversal::UpdateOLP() {
-  if (!modem_info()->cellular_operator_info())
+  SLOG(Cellular, 2) << __func__;
+
+  const CellularOperatorInfo *cellular_operator_info =
+      modem_info()->cellular_operator_info();
+  if (!cellular_operator_info)
+    return;
+
+  const CellularOperatorInfo::CellularOperator *cellular_operator =
+      cellular_operator_info->GetCellularOperatorByMCCMNC(operator_id_);
+  if (!cellular_operator)
     return;
 
   const CellularService::OLP *result =
-      modem_info()->cellular_operator_info()->GetOLPByMCCMNC(operator_id_);
+      cellular_operator_info->GetOLPByMCCMNC(operator_id_);
   if (!result)
     return;
 
@@ -981,7 +1007,8 @@
   ReplaceSubstringsAfterOffset(&post_data, 0, "${iccid}", sim_identifier_);
   ReplaceSubstringsAfterOffset(&post_data, 0, "${imei}", imei_);
   ReplaceSubstringsAfterOffset(&post_data, 0, "${imsi}", imsi_);
-  ReplaceSubstringsAfterOffset(&post_data, 0, "${mdn}", mdn_);
+  ReplaceSubstringsAfterOffset(&post_data, 0, "${mdn}",
+                               GetMdnForOLP(*cellular_operator));
   ReplaceSubstringsAfterOffset(&post_data, 0, "${min}", min_);
   olp.SetPostData(post_data);
   cellular()->service()->SetOLP(olp);