commit f6366ac746f63e4bacaa03ea8e524c2e8ec65aa8
author Arman Uguray <armansito@chromium.org> Wed Jun 12 16:02:28 2013 -0700
committer ChromeBot <chrome-bot@google.com> Thu Jun 13 18:13:16 2013 -0700
tree 622e44725b93c87d342b6640b1a996016e521917
parent 7996364d15f0b58810de2a78f7ec3b20585aae39

cellular: Increase timeout passed to mm1::SimProxy::SendPin.

The default timeout is too short, which causes a "timeout error" to get
propagated to Chrome even when the correct PIN is entered, which causes
an "Incorrect PIN" message to be displayed.

BUG=chromium:249148
TEST=On a device that uses ModemManager (all non-gobi modems):
      (1) Enable SIM lock (The default PIN is '1111').
      (2) Reset modem. Attempt to unlock the SIM.
      (3) After entering the correct PIN, the dialog should disable
      interaction with the text field and the buttons and then disappear.
      Before this CL, it used to show an 'Incorrect PIN' message.
      (4) Verify that the SIM is unlocked.

Change-Id: Ia9ec7d9f33e53c0ac3532754317147fb8de3c411
Reviewed-on: https://gerrit.chromium.org/gerrit/58456
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Arman Uguray <armansito@chromium.org>
Commit-Queue: Arman Uguray <armansito@chromium.org>

cellular_capability_universal.cc

diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index 82429af..1e1d959 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -53,6 +53,7 @@
 const int64
 CellularCapabilityUniversal::kDefaultScanningOrSearchingTimeoutMilliseconds =
     60000;
+const int64 CellularCapabilityUniversal::kEnterPinTimeoutMilliseconds = 20000;
 const int64
 CellularCapabilityUniversal::kRegistrationDroppedUpdateTimeoutMilliseconds =
     15000;
@@ -1247,7 +1248,8 @@
                                            Error *error,
                                            const ResultCallback &callback) {
   CHECK(error);
-  sim_proxy_->SendPin(pin, error, callback, kTimeoutDefault);
+  SLOG(Cellular, 2) << __func__;
+  sim_proxy_->SendPin(pin, error, callback, kEnterPinTimeoutMilliseconds);
 }
 
 void CellularCapabilityUniversal::UnblockPIN(const string &unblock_code,
@@ -1722,6 +1724,7 @@
 }
 
 void CellularCapabilityUniversal::OnSimLockStatusChanged() {
+  SLOG(Cellular, 2) << __func__;
   cellular()->adaptor()->EmitKeyValueStoreChanged(
       flimflam::kSIMLockStatusProperty, SimLockStatusToProperty(NULL));
 

cellular_capability_universal.h

diff --git a/cellular_capability_universal.h b/cellular_capability_universal.h
index ad7a780..6be2b8d 100644
--- a/cellular_capability_universal.h
+++ b/cellular_capability_universal.h
@@ -158,6 +158,7 @@
 
   static const int64 kActivationRegistrationTimeoutMilliseconds;
   static const int64 kDefaultScanningOrSearchingTimeoutMilliseconds;
+  static const int64 kEnterPinTimeoutMilliseconds;
   static const int64 kRegistrationDroppedUpdateTimeoutMilliseconds;
   static const int kSetPowerStateTimeoutMilliseconds;
 

modem.cc

diff --git a/modem.cc b/modem.cc
index 43673b5..6348324 100644
--- a/modem.cc
+++ b/modem.cc
@@ -170,6 +170,8 @@
     const string &interface,
     const DBusPropertiesMap &changed_properties,
     const vector<string> &invalidated_properties) {
+  SLOG(Modem, 2) << __func__;
+  SLOG(Modem, 3) << "PropertiesChanged signal received.";
   if (device_.get()) {
     device_->OnDBusPropertiesChanged(interface,
                                       changed_properties,