[Android] Fix AudioService -> VideoPlayer transition

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Apr  9 17:37:48 2015 +0200| [4e7aaa9df93d07ab5fd637ad4a9e9c0e15a95f07] | committer: Thomas Guillem

Fix AudioService -> VideoPlayer transition

This partially reverts commit 80f7b8ae3f857b694a55074d2c2436292e715348 "Always
Open stream from VideoPlayerActivity"

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=4e7aaa9df93d07ab5fd637ad4a9e9c0e15a95f07
---

 .../src/org/videolan/vlc/audio/AudioService.java   |   22 ++++++
 .../vlc/gui/video/VideoPlayerActivity.java         |   82 ++++++++++++++------
 2 files changed, 80 insertions(+), 24 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commitdiff;h=4e7aaa9df93d07ab5fd637ad4a9e9c0e15a95f07