Bug 742805 - Do not dump ril socket failures on a desktop build with --enable-b2g-ril. r=philikon

dom/system/gonk/ril_worker.js

@@ -1966,7 +1966,7 @@ RIL[REQUEST_VOICE_REGISTRATION_STATE] = function REQUEST_VOICE_REGISTRATION_STAT
   }
 
   let state = Buf.readStringList();
-debug("voice registration state: " + state);
+  if (DEBUG) debug("voice registration state: " + state);
   this._processVoiceRegistrationState(state);
 };
 RIL[REQUEST_DATA_REGISTRATION_STATE] = function REQUEST_DATA_REGISTRATION_STATE(length, options) {
@@ -2090,9 +2090,11 @@ RIL[REQUEST_SIM_IO] = function REQUEST_SIM_IO(length, options) {
   if (sw1 != ICC_STATUS_NORMAL_ENDING) {
     // See GSM11.11, TS 51.011 clause 9.4, and ISO 7816-4 for the error
     // description.
-    debug("ICC I/O Error EF id = " + options.fileid.toString(16) +
-          " command = " + options.command.toString(16) +
-          "(" + sw1.toString(16) + "/" + sw2.toString(16) + ")");
+    if (DEBUG) {
+      debug("ICC I/O Error EF id = " + options.fileid.toString(16) +
+            " command = " + options.command.toString(16) +
+            "(" + sw1.toString(16) + "/" + sw2.toString(16) + ")");
+    }
     return;
   }
 

ipc/ril/Ril.cpp

@@ -229,7 +229,9 @@ RilClient::OpenSocket()
     }
 
     if (connect(mSocket.mFd, (struct sockaddr *) &addr, alen) < 0) {
+#if defined(MOZ_WIDGET_GONK)
         LOG("Cannot open socket for RIL!\n");
+#endif
         close(mSocket.mFd);
         return false;
     }