commit 721ac93ab19a9169872a296626adb49279031af5
author Darin Petkov <petkov@chromium.org> Wed Nov 16 15:43:09 2011 +0100
committer Gerrit <chrome-bot@google.com> Thu Nov 17 10:35:16 2011 -0800
tree ffa8be65b91f6b7956609759defdb7d2be247a3c
parent ae0c64ea644748f28b7a320e9663f30cd69e344e

shill: Refactor SIM lock status properties into the GSM delegate.

BUG=chromium-os:18735
TEST=unit tests (old and new)

Change-Id: I829eb6cee67cb1ab418cf16a32c2195e3446a22b
Reviewed-on: https://gerrit.chromium.org/gerrit/11765
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

modem.cc

diff --git a/modem.cc b/modem.cc
index 3aa70d4..9490656 100644
--- a/modem.cc
+++ b/modem.cc
@@ -22,8 +22,6 @@
 const char Modem::kPropertyIPMethod[] = "IpMethod";
 const char Modem::kPropertyState[] = "State";
 const char Modem::kPropertyType[] = "Type";
-const char Modem::kPropertyUnlockRequired[] = "UnlockRequired";
-const char Modem::kPropertyUnlockRetries[] = "UnlockRetries";
 
 Modem::Modem(const std::string &owner,
              const std::string &path,
@@ -128,16 +126,8 @@
   DBusProperties::GetUint32(properties, kPropertyState, &modem_state);
   device_->set_modem_state(static_cast<Cellular::ModemState>(modem_state));
 
-  string unlock_required;
-  if (DBusProperties::GetString(
-          properties, kPropertyUnlockRequired, &unlock_required)) {
-    uint32 unlock_retries = 0;
-    DBusProperties::GetUint32(properties,
-                              kPropertyUnlockRetries,
-                              &unlock_retries);
-    device_->set_sim_lock_status(
-        Cellular::SimLockStatus(unlock_required, unlock_retries));
-  }
+  // Give the device a chance to extract any capability-specific properties.
+  device_->OnModemManagerPropertiesChanged(properties);
 
   manager_->device_info()->RegisterDevice(device_);
 }
@@ -152,18 +142,9 @@
 void Modem::OnModemManagerPropertiesChanged(
     const string &/*interface*/,
     const DBusPropertiesMap &properties) {
-  if (!device_.get()) {
-    return;
+  if (device_.get()) {
+    device_->OnModemManagerPropertiesChanged(properties);
   }
-  Cellular::SimLockStatus lock_status = device_->sim_lock_status();
-  if (DBusProperties::GetString(
-          properties, kPropertyUnlockRequired, &lock_status.lock_type) ||
-      DBusProperties::GetUint32(properties,
-                                kPropertyUnlockRetries,
-                                &lock_status.retries_left)) {
-    device_->set_sim_lock_status(lock_status);
-  }
-  device_->OnModemManagerPropertiesChanged(properties);
 }
 
 }  // namespace shill