commit c466ccb31d7f64d4dae38149c118d9612cbe5f30
author Thieu Le <thieule@chromium.org> Mon Jun 23 15:24:56 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jun 24 20:09:02 2014 +0000
tree 856320f3821c9359309adee8ec6c6d1ac8d3c106
parent 6efec622f0a211841bfbfa83f8abfccdb36c43a6

shill: cellular: Use "Plugin" property to determine Altair specific behavior.

BUG=chrome-os-partner:29856
TEST=1. Unit tests
2. For Expresso and Spring, enable verbose shill logging. From log, verify
we're still using subscription status out-of-credits detector and suspend
does not attempt to deactivate the PDN from log entry.

Change-Id: I2741dfdc46a0295ecbcb767ceef6a51aaa5916cf
Reviewed-on: https://chromium-review.googlesource.com/205272
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Queue: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index 6bd83d7..c5f38ff 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -1296,7 +1296,7 @@
   adaptor()->EmitStringChanged(kEsnProperty, esn_);
 }
 
-void Cellular::set_firmware_revision(const std::string &firmware_revision) {
+void Cellular::set_firmware_revision(const string &firmware_revision) {
   if (firmware_revision_ == firmware_revision)
     return;
 
@@ -1304,7 +1304,7 @@
   adaptor()->EmitStringChanged(kFirmwareRevisionProperty, firmware_revision_);
 }
 
-void Cellular::set_hardware_revision(const std::string &hardware_revision) {
+void Cellular::set_hardware_revision(const string &hardware_revision) {
   if (hardware_revision_ == hardware_revision)
     return;
 
@@ -1314,7 +1314,7 @@
 
 // TODO(armansito): The following methods should probably log their argument
 // values. Need to learn if any of them need to be scrubbed.
-void Cellular::set_imei(const std::string &imei) {
+void Cellular::set_imei(const string &imei) {
   if (imei_ == imei)
     return;
 
@@ -1322,7 +1322,7 @@
   adaptor()->EmitStringChanged(kImeiProperty, imei_);
 }
 
-void Cellular::set_imsi(const std::string &imsi) {
+void Cellular::set_imsi(const string &imsi) {
   if (imsi_ == imsi)
     return;
 
@@ -1330,7 +1330,7 @@
   adaptor()->EmitStringChanged(kImsiProperty, imsi_);
 }
 
-void Cellular::set_mdn(const std::string &mdn) {
+void Cellular::set_mdn(const string &mdn) {
   if (mdn_ == mdn)
     return;
 
@@ -1338,7 +1338,7 @@
   adaptor()->EmitStringChanged(kMdnProperty, mdn_);
 }
 
-void Cellular::set_meid(const std::string &meid) {
+void Cellular::set_meid(const string &meid) {
   if (meid_ == meid)
     return;
 
@@ -1346,7 +1346,7 @@
   adaptor()->EmitStringChanged(kMeidProperty, meid_);
 }
 
-void Cellular::set_min(const std::string &min) {
+void Cellular::set_min(const string &min) {
   if (min_ == min)
     return;
 
@@ -1354,7 +1354,7 @@
   adaptor()->EmitStringChanged(kMinProperty, min_);
 }
 
-void Cellular::set_manufacturer(const std::string &manufacturer) {
+void Cellular::set_manufacturer(const string &manufacturer) {
   if (manufacturer_ == manufacturer)
     return;
 
@@ -1362,7 +1362,7 @@
   adaptor()->EmitStringChanged(kManufacturerProperty, manufacturer_);
 }
 
-void Cellular::set_model_id(const std::string &model_id) {
+void Cellular::set_model_id(const string &model_id) {
   if (model_id_ == model_id)
     return;
 
@@ -1370,6 +1370,10 @@
   adaptor()->EmitStringChanged(kModelIDProperty, model_id_);
 }
 
+void Cellular::set_mm_plugin(const string &mm_plugin) {
+  mm_plugin_ = mm_plugin;
+}
+
 void Cellular::set_scanning(bool scanning) {
   if (scanning_ == scanning)
     return;
@@ -1397,7 +1401,7 @@
   }
 }
 
-void Cellular::set_selected_network(const std::string &selected_network) {
+void Cellular::set_selected_network(const string &selected_network) {
   if (selected_network_ == selected_network)
     return;