Fix potential crash on AudioFocus loss

49174a6f · Jean-Baptiste Kempf · 56cde161 · 49174a6f
Commit 49174a6f authored Aug 02, 2014 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java ...d/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java +6 -2

No files found.
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -810,8 +810,12 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
            mAudioManager.setParameters("bgm_state=true");
        }
        else {
-            result = mAudioManager.abandonAudioFocus(mAudioFocusListener);
+            if (mAudioManager != null) {
-            mAudioManager.setParameters("bgm_state=false");
+                result = mAudioManager.abandonAudioFocus(mAudioFocusListener);
+                mAudioManager.setParameters("bgm_state=false");
+            }
+            else
+                result = AudioManager.AUDIOFOCUS_REQUEST_FAILED;
        }
        return result;