Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 28 Nov 2012 22:46:45 -0500
changeset 114443 3fec1ffef127bc8885407663211339917808b76d
parent 114442 10b4034b8b16252c1cbcdad27a5c1d04a37db3ac (current diff)
parent 114362 c63d5cff18bac0fd5a1749677488b14a143e7005 (diff)
child 114444 1a19b191539219f5d991ab844c1b52ccbc5a430f
push id23917
push useremorley@mozilla.com
push dateThu, 29 Nov 2012 14:20:29 +0000
treeherdermozilla-central@c72d38e7a212 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.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
Merge m-c to inbound.
--- a/browser/components/search/test/browser_private_search_perwindowpb.js
+++ b/browser/components/search/test/browser_private_search_perwindowpb.js
@@ -51,21 +51,20 @@ function test() {
     Services.obs.addObserver(observer, "browser-search-engine-modified", false);
     Services.search.addEngine(
       engineURL + "426329.xml", Ci.nsISearchEngine.DATA_XML,
       "data:image/x-icon,%00", false);
   }
 
   function testOnWindow(aIsPrivate, aCallback) {
     let win = OpenBrowserWindow({ private: aIsPrivate });
-    win.addEventListener("load", function onLoad() {
-      win.removeEventListener("load", onLoad, false);
+    waitForFocus(function() {
       windowsToClose.push(win);
       executeSoon(function() aCallback(win));
-    }, false);
+    }, win);
   }
 
   addEngine(function() {
     testOnWindow(false, function(win) {
       performSearch(win, false, function() {
         testOnWindow(true, function(win) {
           performSearch(win, true, function() {
             testOnWindow(false, function(win) {
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1142,29 +1142,29 @@ RadioInterfaceLayer.prototype = {
 
   /**
    * Handle an incoming call.
    *
    * Not much is known about this call at this point, but it's enough
    * to start bringing up the Phone app already.
    */
   handleCallRing: function handleCallRing() {
-    gSystemMessenger.broadcastMessage("telephony-new-call");
+    gSystemMessenger.broadcastMessage("telephony-new-call", {});
   },
 
   /**
    * Handle call state changes by updating our current state and the audio
    * system.
    */
   handleCallStateChange: function handleCallStateChange(call) {
     debug("handleCallStateChange: " + JSON.stringify(call));
     call.state = convertRILCallState(call.state);
 
     if (call.state == nsIRadioInterfaceLayer.CALL_STATE_DIALING) {
-      gSystemMessenger.broadcastMessage("telephony-new-call");
+      gSystemMessenger.broadcastMessage("telephony-new-call", {});
     }
 
     if (call.isActive) {
       this._activeCall = call;
     } else if (this._activeCall &&
                this._activeCall.callIndex == call.callIndex) {
       // Previously active call is not active now.
       this._activeCall = null;
copy from mobile/android/config/tooltool-manifests/android/releng.manifest
copy to mobile/android/config/tooltool-manifests/android-x86/android/releng.manifest