Bug 925676 - Part 2: RIL implementation. r=vyang,gene
authorEdgar Chen <echen@mozilla.com>
Tue, 22 Oct 2013 18:43:03 +0800
changeset 166928 c33d3181d2c55f7db34e8cc11e3e5c362f6849a2
parent 166927 48aebf562dcca21a2f2ba0e934cddc7a1d9543d6
child 166929 704e9cae5ed6ff6b72464db9a815d3c254e01e5c
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvyang, gene
bugs925676
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 925676 - Part 2: RIL implementation. r=vyang,gene
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -3232,18 +3232,20 @@ function RILNetworkInterface(radioInterf
   this.connectedTypes = [];
 }
 
 RILNetworkInterface.prototype = {
   classID:   RILNETWORKINTERFACE_CID,
   classInfo: XPCOMUtils.generateCI({classID: RILNETWORKINTERFACE_CID,
                                     classDescription: "RILNetworkInterface",
                                     interfaces: [Ci.nsINetworkInterface,
+                                                 Ci.nsIRilNetworkInterface,
                                                  Ci.nsIRILDataCallback]}),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInterface,
+                                         Ci.nsIRilNetworkInterface,
                                          Ci.nsIRILDataCallback]),
 
   // nsINetworkInterface
 
   NETWORK_STATE_UNKNOWN:       Ci.nsINetworkInterface.NETWORK_STATE_UNKNOWN,
   NETWORK_STATE_CONNECTING:    Ci.nsINetworkInterface.CONNECTING,
   NETWORK_STATE_CONNECTED:     Ci.nsINetworkInterface.CONNECTED,
   NETWORK_STATE_DISCONNECTING: Ci.nsINetworkInterface.DISCONNECTING,
@@ -3299,16 +3301,25 @@ RILNetworkInterface.prototype = {
   get httpProxyHost() {
     return this.apnSetting.proxy || '';
   },
 
   get httpProxyPort() {
     return this.apnSetting.port || '';
   },
 
+  get serviceId() {
+    return this.radioInterface.clientId;
+  },
+
+  get iccId() {
+    let iccInfo = this.radioInterface.rilContext.iccInfo;
+    return iccInfo && iccInfo.iccid;
+  },
+
   debug: function debug(s) {
     dump("-*- RILNetworkInterface[" + this.radioInterface.clientId + ":" +
          this.type + "]: " + s + "\n");
   },
 
   // nsIRILDataCallback
 
   dataCallError: function dataCallError(message) {