Bug 843452 - Part 4-1: Interface changes for gonk backend. r=hsinyi
☠☠ backed out by de824c1ec349 ☠ ☠
authorEdgar Chen <echen@mozilla.com>
Wed, 02 Jul 2014 18:08:59 +0800
changeset 224036 e31b86ef0e80e3e281a0c4ab50ef4cda61cd0240
parent 224035 bd4efde535cd39ee20f93a67c54f575c26fe21b4
child 224037 8d6428a93500bef32e830827a669da24de805137
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs843452
milestone34.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 843452 - Part 4-1: Interface changes for gonk backend. r=hsinyi
dom/mobileconnection/interfaces/moz.build
dom/mobileconnection/interfaces/nsIMobileConnectionGonkService.idl
dom/system/gonk/nsIRadioInterfaceLayer.idl
--- a/dom/mobileconnection/interfaces/moz.build
+++ b/dom/mobileconnection/interfaces/moz.build
@@ -8,9 +8,14 @@ XPIDL_SOURCES += [
     'nsICellInfo.idl',
     'nsIMobileCellInfo.idl',
     'nsIMobileConnectionInfo.idl',
     'nsIMobileConnectionService.idl',
     'nsIMobileNetworkInfo.idl',
     'nsINeighboringCellInfo.idl',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    XPIDL_SOURCES += [
+        'nsIMobileConnectionGonkService.idl',
+    ]
+
 XPIDL_MODULE = 'dom_mobileconnection'
new file mode 100644
--- /dev/null
+++ b/dom/mobileconnection/interfaces/nsIMobileConnectionGonkService.idl
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsIMobileConnectionService.idl"
+
+%{C++
+#define NS_MOBILECONNECTION_GONK_SERVICE_CONTRACTID \
+        "@mozilla.org/mobileconnection/mobileconnectiongonkservice;1"
+%}
+
+[scriptable, uuid(c5baceda-247a-4018-855d-ad5b00f2e4e2)]
+interface nsIMobileConnectionGonkService : nsIMobileConnectionService
+{
+  void notifyNetworkInfoChanged(in unsigned long clientId, in jsval networkInfo);
+
+  void notifyVoiceInfoChanged(in unsigned long clientId, in jsval voiceInfo);
+
+  void notifyDataInfoChanged(in unsigned long clientId, in jsval dataInfo);
+
+  void notifyDataError(in unsigned long clientId, in DOMString message);
+
+  void notifySignalStrengthChanged(in unsigned long clientId, in jsval signal);
+
+  void notifyOperatorChanged(in unsigned long clientId, in jsval info);
+
+  void notifyOtaStatusChanged(in unsigned long clientId, in DOMString status);
+
+  void notifyRadioStateChanged(in unsigned long clientId,
+                               in DOMString radioState);
+
+  void notifyUssdReceived(in unsigned long clientId,
+                          in DOMString message,
+                          in boolean sessionEnded);
+
+  void notifyEmergencyCallbackModeChanged(in unsigned long clientId,
+                                          in boolean active,
+                                          in unsigned long timeoutMs);
+
+  void notifyIccChanged(in unsigned long clientId, in DOMString iccId);
+
+  void notifyNetworkSelectModeChanged(in unsigned long clientId,
+                                      in DOMString mode);
+
+  void notifySpnAvailable(in unsigned long clientId);
+
+  void notifyLastHomeNetworkChanged(in unsigned long clientId,
+                                    in DOMString network);
+};
--- a/dom/system/gonk/nsIRadioInterfaceLayer.idl
+++ b/dom/system/gonk/nsIRadioInterfaceLayer.idl
@@ -26,34 +26,24 @@ interface nsIRilNetworkInterface : nsINe
 [scriptable, uuid(c0c5cb9f-6372-4b5a-b74c-baacc2da5e4f)]
 interface nsIVoicemailInfo : nsISupports
 {
   readonly attribute DOMString number;
 
   readonly attribute DOMString displayName;
 };
 
-[scriptable, uuid(8f33281f-b262-4bc6-9862-2cab897245ac)]
+[scriptable, uuid(0226a2c1-a3b9-416a-92cb-c89e4dad4be0)]
 interface nsIRilContext : nsISupports
 {
-  readonly attribute DOMString radioState;
-
   readonly attribute DOMString cardState;
 
-  readonly attribute long retryCount;
-
   readonly attribute DOMString imsi;
 
-  readonly attribute DOMString networkSelectionMode;
-
   readonly attribute nsIDOMMozIccInfo iccInfo;
-
-  readonly attribute nsIMobileConnectionInfo voice;
-
-  readonly attribute nsIMobileConnectionInfo data;
 };
 
 [scriptable, function, uuid(3bc96351-53b0-47a1-a888-c74c64b60f25)]
 interface nsIRilSendWorkerMessageCallback : nsISupports
 {
   boolean handleResponse(in jsval response);
 };