[Android] Do not require audiofocus when rendering

[Geoffrey Métais]

vlc-android | branch: 3.0.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Feb 14 17:18:36 2018 +0100| [721d85246bc2aae3fd346ea4916d9e70c926dab1] | committer: Geoffrey Métais

Do not require audiofocus when rendering

(cherry picked from commit 117db707bc9d95b4fd7018a08b6a01c71ff09e0f)

> https://code.videolan.org/videolan/vlc-android/commit/721d85246bc2aae3fd346ea4916d9e70c926dab1
---

 vlc-android/src/org/videolan/vlc/PlaybackService.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java
index e9a919cbc..bc04fd5c6 100644
--- a/vlc-android/src/org/videolan/vlc/PlaybackService.java
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java
@@ -381,7 +381,7 @@ public class PlaybackService extends MediaBrowserServiceCompat{
         if (mAudioManager == null)
             return;
 
-        if (acquire) {
+        if (acquire && !hasRenderer()) {
             if (!mHasAudioFocus) {
                 final int result = mAudioManager.requestAudioFocus(mAudioFocusListener,
                         AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
@@ -390,12 +390,10 @@ public class PlaybackService extends MediaBrowserServiceCompat{
                     mHasAudioFocus = true;
                 }
             }
-        } else {
-            if (mHasAudioFocus) {
-                mAudioManager.abandonAudioFocus(mAudioFocusListener);
-                mAudioManager.setParameters("bgm_state=false");
-                mHasAudioFocus = false;
-            }
+        } else if (mHasAudioFocus) {
+            mAudioManager.abandonAudioFocus(mAudioFocusListener);
+            mAudioManager.setParameters("bgm_state=false");
+            mHasAudioFocus = false;
         }
     }
 
@@ -1768,6 +1766,8 @@ public class PlaybackService extends MediaBrowserServiceCompat{
         if (wasOnRenderer && !hasRenderer() && canSwitchToVideo()) VideoPlayerActivity.startOpened(VLCApplication.getAppContext(),
                 playlistManager.getCurrentMedia().getUri(), playlistManager.getCurrentIndex());
         playlistManager.getPlayer().setRenderer(item);
+        if (!wasOnRenderer && item != null) changeAudioFocus(false);
+        else if (wasOnRenderer && item == null && isPlaying()) changeAudioFocus(true);
     }
 
     @MainThread