Merge remote branch 'chromium/to-upstream'

introspection/org.freedesktop.ModemManager.Modem.Cdma.xml

@@ -5,7 +5,9 @@
 
     <method name="Activate">
       <tp:docstring>
-        Activates the modem for use with a given carrier.
+        Activates the modem for use with a given carrier.  In the
+        event of immediate failure, returns an error value instead of
+        setting a DBus error.
       </tp:docstring>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_activate"/>
@@ -14,6 +16,13 @@
           Name of carrier.
         </tp:docstring>
       </arg>
+      <arg name="immediate_error" type="u" direction="out">
+        <tp:docstring>
+          An enum from MM_MODEM_CDMA_ACTIVATION_ERROR.  This is
+          returned for immediate errors.  Delayed errors are returned
+          via an ActivationStateChanged signal
+        </tp:docstring>
+      </arg>
     </method>
 
     <method name="ActivateManual">
@@ -31,6 +40,24 @@
       </arg>
     </method>
 
+    <signal name="ActivationStateChanged">
+      <tp:docstring>
+	    The device activation state changed.
+      </tp:docstring>
+      <arg name="activation_state" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_STATE">
+        <tp:docstring>Current activation state</tp:docstring>
+      </arg>
+      <arg name="activation_error" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_ERROR">
+        <tp:docstring>Carrier-specific error code</tp:docstring>
+      </arg>
+      <arg name="status_changes" type="a{sv}">
+        <tp:docstring>Selected Modem.Simple.GetStatus keys that have changed as a
+          result of this activation state change.  Will include 'mdn'
+          and 'min'.
+        </tp:docstring>
+      </arg>
+    </signal>
+
     <method name="GetSignalQuality">
       <tp:docstring>
 	Get the current signal quality.
@@ -140,6 +167,54 @@
         <tp:docstring>Device is ready for use.</tp:docstring>
       </tp:enumvalue>
     </tp:enum>
+
+    <tp:enum name="MM_MODEM_CDMA_ACTIVATION_ERROR" type="u">
+      <tp:enumvalue suffix="NO_ERROR" value="0"/>
+      <tp:enumvalue suffix="ROAMING" value="1">
+        <tp:docstring>
+          Device cannot activate while roaming.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="WRONG_RADIO_INTERFACE" value="2">
+        <tp:docstring>
+          Device cannot activate on this network type (eg EVDO vs 1xRTT).
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="COULD_NOT_CONNECT" value="3">
+        <tp:docstring>
+          Device could not connect to the network for activation.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SECURITY_AUTHENTICATION_FAILED" value="4">
+        <tp:docstring>
+          Device could not authenticate to the network for activation.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PROVISIONING_FAILED" value="5">
+        <tp:docstring>
+          Later stages of device provisioning failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NO_SIGNAL" value="6">
+        <tp:docstring>
+          No signal available.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNKNOWN" value="7">
+        <tp:docstring>
+          An error occurred.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="TIMED_OUT" value="8">
+        <tp:docstring>
+          Activation timed out.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="START_FAILED" value="9">
+        <tp:docstring>
+          API call for initial activation failed.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
   </interface>
 </node>
-

introspection/org.freedesktop.ModemManager.Modem.xml

@@ -104,6 +104,11 @@
           Reason for state transition.
         </tp:docstring>
       </arg>
+      <arg name="reason" type="u" tp:type="MM_MODEM_CONNECTION_STATE_CHANGED_REASON">
+        <tp:docstring>
+          Reason for this state change.
+        </tp:docstring>
+      </arg>
     </signal>
 
     <property name="Device" type="s" access="read">
@@ -222,5 +227,24 @@
       </tp:enumvalue>
     </tp:enum>
 
+    <tp:enum name="MM_MODEM_CONNECTION_STATE_CHANGE_REASON" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          Reason unknown or not reportable.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="REQUESTED" value="1">
+        <tp:docstring>
+          Connection state change was requested by an interface user.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUSPEND" value="2">
+        <tp:docstring>
+          Connection state change was caused by a system suspend.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+
   </interface>
 </node>