Merge pull request #15826 from jimporter/dialer-tone-priority

Bug 961986 - [fugu][buri] it took long time to resume music play after ending a phone call r=etienne

apps/communications/dialer/js/oncall.js

@@ -7,3 +7,11 @@ window.addEventListener('load', function callSetup(evt) {
   CallScreen.init();
   KeypadManager.init(true);
 });
+
+window.addEventListener('unload', function() {
+  // When we end the call, we need to clean up the TonePlayer to reset the audio
+  // context's channel back to "normal" to let other audio start playing again.
+  // Otherwise, we'll have to wait until the cycle collector kills it, which
+  // can take a while.
+  TonePlayer.setChannel('normal');
+});