Merge pull request #14998 from KevinGrandon/bug_956012_update_mobile_…

…shims Bug 956012 - Desktop b2g with local profile is trying to load the SIM / JavaScript error: conn.setVoicePrivacyMode is not a function
mozilla-b2g · Jan 2, 2014 · fa66acd · fa66acd
2 parents 3a94cb8 + 23db312
commit fa66acd
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/tools/extensions/desktop-helper/content/data/lib/mobile_connection.js b/tools/extensions/desktop-helper/content/data/lib/mobile_connection.js
@@ -24,7 +24,9 @@
 
   function fakeEventListener(type, callback, bubble) {
     if (initialized) {
-      setTimeout(callback.bind(this, { iccId: this.iccId }));
+      if (typeof callback === 'function') {
+        setTimeout(callback.bind(this, { iccId: this.iccId }));
+      }
       return;
     }
 
@@ -45,6 +47,12 @@
     getCallForwardingOption: FFOS_RUNTIME.domRequest(1),
     setCallWaitingOption: FFOS_RUNTIME.domRequest(),
     getCallingLineIdRestriction: FFOS_RUNTIME.domRequest(),
+    setVoicePrivacyMode: FFOS_RUNTIME.domRequest(),
+    getVoicePrivacyMode: FFOS_RUNTIME.domRequest(),
+    setRadioEnabled: FFOS_RUNTIME.domRequest(),
+    getRadioEnabled: FFOS_RUNTIME.domRequest(),
+    getPreferredNetworkType:  FFOS_RUNTIME.domRequest(),
+    setPreferredNetworkType:  FFOS_RUNTIME.domRequest(),
     get data() {
       return initialized ? { network: fakeNetwork } : null;
     },
@@ -62,6 +70,12 @@
       getCallForwardingOption: FFOS_RUNTIME.domRequest(1),
       setCallWaitingOption: FFOS_RUNTIME.domRequest(),
       getCallingLineIdRestriction: FFOS_RUNTIME.domRequest(),
+      setVoicePrivacyMode: FFOS_RUNTIME.domRequest(),
+      getVoicePrivacyMode: FFOS_RUNTIME.domRequest(),
+      setRadioEnabled: FFOS_RUNTIME.domRequest(),
+      getRadioEnabled: FFOS_RUNTIME.domRequest(),
+      getPreferredNetworkType:  FFOS_RUNTIME.domRequest(),
+      setPreferredNetworkType:  FFOS_RUNTIME.domRequest(),
       get data() {
         return initialized ? { network: fakeNetwork2 } : null;
       },