Bug 1062912 - Part 1: move getNeighboringCellIds and getCellInfoList to nsIMobileConnectionService (idl). r=hsinyi

dom/mobileconnection/interfaces/nsICellInfo.idl

@@ -4,13 +4,17 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(1aed4c36-979e-4d20-9fa0-55139da8301e)]
+interface nsICellInfo;
+
+[scriptable, uuid(d8fae631-7ade-4024-b288-7efe75e6b091)]
 interface nsICellInfoListCallback : nsISupports
 {
   /**
-   * result is an array of nsICellInfo.
+   * result is an array of nsICellInfo, which could be instances of
+   * nsIGsmCellInfo, nsIWcdmaCellInfo, nsICdmaCellInfo or nsILteCellInfo.
    */
-  void notifyGetCellInfoList(in jsval result);
+  void notifyGetCellInfoList(in uint32_t count,
+                             [array, size_is(count)] in nsICellInfo result);
 
   /**
    * Callback function with error message.

dom/mobileconnection/interfaces/nsIMobileConnectionService.idl

@@ -4,10 +4,12 @@
 
 #include "nsISupports.idl"
 
+interface nsICellInfoListCallback;
 interface nsIMobileCallForwardingOptions;
 interface nsIMobileConnection;
 interface nsIMobileConnectionInfo;
 interface nsIMobileNetworkInfo;
+interface nsINeighboringCellIdsCallback;
 interface nsIVariant;
 
 [scriptable, uuid(823d935e-8262-47ed-8429-8203096b2ff4)]
@@ -234,7 +236,7 @@ already_AddRefed<nsIMobileConnectionService>
 NS_CreateMobileConnectionService();
 %}
 
-[scriptable, uuid(bde83c1d-1335-43b6-8268-ec7e320167f0)]
+[scriptable, uuid(cfc7d15b-d2c2-4f28-ad9f-b250030c3073)]
 interface nsIMobileConnection : nsISupports
 {
   /*
@@ -764,4 +766,23 @@ interface nsIMobileConnection : nsISupports
    */
   void setRadioEnabled(in bool enabled,
                        in nsIMobileConnectionCallback requestCallback);
+
+  /**
+   * Request neighboring cell ids in GSM/UMTS network.
+   *
+   * @param callback
+   *        Called when request is finished. See nsINeighboringCellIdsCallback
+   *        for details.
+   */
+  void getNeighboringCellIds(in nsINeighboringCellIdsCallback callback);
+
+  /**
+   * Request all of the current cell information known to the radio, including
+   * neighboring cells.
+   *
+   * @param callback
+   *        Called when request is finished. See nsICellInfoListCallback
+   *        for details.
+   */
+  void getCellInfoList(in nsICellInfoListCallback callback);
 };

dom/mobileconnection/interfaces/nsINeighboringCellInfo.idl

@@ -4,13 +4,16 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(909f5972-c74e-44dd-b72a-7ddb62aae617)]
+interface nsINeighboringCellInfo;
+
+[scriptable, uuid(0941cb79-36e5-41e0-b05f-cdb854c53f03)]
 interface nsINeighboringCellIdsCallback : nsISupports
 {
   /**
    * result is an array of nsINeighboringCellInfo.
    */
-  void notifyGetNeighboringCellIds(in jsval result);
+  void notifyGetNeighboringCellIds(in uint32_t count,
+                                   [array, size_is(count)] in nsINeighboringCellInfo result);
 
   /**
    * Callback function with error message.

dom/system/gonk/nsIRadioInterfaceLayer.idl

@@ -5,11 +5,9 @@
 #include "nsISupports.idl"
 #include "nsINetworkManager.idl"
 
-interface nsICellInfoListCallback;
 interface nsIIccInfo;
 interface nsIMobileConnectionInfo;
 interface nsIMobileMessageCallback;
-interface nsINeighboringCellIdsCallback;
 
 [scriptable, uuid(6e0f45b8-410e-11e3-8c8e-b715b2cd0128)]
 interface nsIRilNetworkInterface : nsINetworkInterface
@@ -42,7 +40,7 @@ interface nsIRilSendWorkerMessageCallback : nsISupports
   boolean handleResponse(in jsval response);
 };
 
-[scriptable, uuid(c13a8890-797b-4557-b92f-6b959f56c1d8)]
+[scriptable, uuid(622e8809-1a89-45f7-9b35-7e49b5aaa69f)]
 interface nsIRadioInterface : nsISupports
 {
   readonly attribute nsIRilContext rilContext;
@@ -72,17 +70,6 @@ interface nsIRadioInterface : nsISupports
               [optional] in nsIRilSendWorkerMessageCallback callback);
 
   void getSmscAddress(in nsIMobileMessageCallback request);
-
-  /**
-   * Request neighboring cell ids in GSM/UMTS network.
-   */
-  void getNeighboringCellIds(in nsINeighboringCellIdsCallback callback);
-
-  /**
-   * Request all of the current cell information known to the radio, including
-   * neighboring cells.
-   */
-  void getCellInfoList(in nsICellInfoListCallback callback);
 };
 
 [scriptable, uuid(78b65e8c-68e7-4510-9a05-65bba12b283e)]