Merge pull request #33581 from evanxd/bug-1230069

Bug 1230069 - Fix test cases: public notification competes with normal and content r=lchang
mozilla-b2g · Dec 23, 2015 · 2397c80 · 2397c80
2 parents de7f09d + 5025c88
commit 2397c80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/apps/system/js/audio_channel_service.js b/apps/system/js/audio_channel_service.js
@@ -134,8 +134,10 @@
     _resetAudioChannel: function(audioChannel) {
       audioChannel.setPolicy({ isAllowedToPlay: false });
       this._handleAudioChannel(audioChannel);
-      audioChannel.name === 'notification' &&
+      if (audioChannel.name === 'notification' ||
+          audioChannel.name === 'publicnotification') {
         this._fadeInFadedOutAudioChannels();
+      }
     },
 
     /**

diff --git a/apps/system/test/marionette/audio_channel_competing_test.js b/apps/system/test/marionette/audio_channel_competing_test.js
@@ -336,14 +336,12 @@ marionette('Audio channel competing', function() {
         client, 'app://audiochanneltestapp2.gaiamobile.org');
     });
 
-    // Fix it in Bug 1230069.
-    test.skip('Public notification channel competes with ' +
+    test('Public notification channel competes with ' +
               'normal channel', function() {
       assertPolicy4('publicnotification', 'normal');
     });
 
-    // Fix it in Bug 1230069.
-    test.skip('Public notification channel competes with ' +
+    test('Public notification channel competes with ' +
               'content channel', function() {
       assertPolicy4('publicnotification', 'content');
     });

diff --git a/tv_apps/smart-system/js/audio_channel_service.js b/tv_apps/smart-system/js/audio_channel_service.js
@@ -159,8 +159,10 @@
     _resetAudioChannel: function(audioChannel) {
       audioChannel.setPolicy({ isAllowedToPlay: false });
       this._handleAudioChannel(audioChannel);
-      audioChannel.name === 'notification' &&
+      if (audioChannel.name === 'notification' ||
+          audioChannel.name === 'publicnotification') {
         this._fadeInFadedOutAudioChannels();
+      }
     },
 
     /**