Merge b2ginbound to central, a=merge

b2g/config/aries/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/dolphin/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-ics/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>

b2g/config/emulator-jb/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>

b2g/config/emulator-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-l/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator/sources.xml

@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>

b2g/config/flame-kk/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/gaia.json

@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "5997b406e77ea726fbd9047057a1c3504f6cd6d4", 
+        "git_revision": "90ed5ebde89b6fc095524e47c59d5b8d192d3ff2", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "c050d923dd3c87275a0d3668e54e08aed99f7678", 
+    "revision": "a49e3b3bbdc87f84039093f17441a59d1cbb2960", 
     "repo_path": "integration/gaia-central"
 }

b2g/config/nexus-4/sources.xml

@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>

b2g/config/nexus-5-l/sources.xml

@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5997b406e77ea726fbd9047057a1c3504f6cd6d4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="90ed5ebde89b6fc095524e47c59d5b8d192d3ff2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

dom/telephony/gonk/TelephonyService.js

@@ -1185,6 +1185,17 @@ TelephonyService.prototype = {
       return;
     }
 
+    // It's a foreground call.
+    if (!call.isConference) {
+      let heldCalls = this._getCallsWithState(aClientId, nsITelephonyService.CALL_STATE_HELD);
+
+      // Automatic resume another held call.
+      if (heldCalls.length) {
+        this._hangUpForeground(aClientId, aCallback);
+        return;
+      }
+    }
+
     call.hangUpLocal = true;
     this._sendToRilWorker(aClientId, "hangUpCall", { callIndex: aCallIndex },
                           this._defaultCallbackHandler.bind(this, aCallback));

dom/telephony/test/marionette/test_multiple_hold.js

@@ -46,9 +46,13 @@ startTest(function() {
     .then(() => gCheckAll(inCall, [inCall, outCall], "", [],
                           [inInfo.active, outInfo.held]))
 
-    .then(() => gHangUp(inCall))
-    .then(() => gCheckAll(null, [outCall], "", [], [outInfo.held]))
-
+    // Hangup the active call will automatically resume the held call.
+    .then(() => {
+      let p1 = gWaitForNamedStateEvent(outCall, "connected");
+      let p2 = gHangUp(inCall);
+      return Promise.all([p1, p2]);
+    })
+    .then(() => gCheckAll(outCall, [outCall], "", [], [outInfo.active]))
     .then(() => gHangUp(outCall))
     .then(() => gCheckAll(null, [], "", [], []))
 

testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml

@@ -8,11 +8,14 @@ task:
   scopes:
     - 'docker-worker:cache:workspace-emulator-jb-debug'
   metadata:
-    name: '[TC] B2G Emulator JB: (Debug)'
+    name: '[TC] B2G Emulator JB (Debug)'
 
   extra:
-    # Disable "TC" prefix...
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
+      # Disable "TC" prefix...
       groupSymbol: "?"
       collection:
         debug: true