summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2018-09-19 16:06:05 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-09-19 01:25:36 -0700
commitbb4cc19c7f1c7fd83d0db47c2b2e4ad84187d2ad (patch)
tree384e8be31a3de51c2996489b9107f3477213397e /src/com/android/gallery3d/app
parent2000fa7e4780ff40fd3f6e61a993b9072614db02 (diff)
downloadandroid_packages_apps_Gallery2-bb4cc19c7f1c7fd83d0db47c2b2e4ad84187d2ad.tar.gz
android_packages_apps_Gallery2-bb4cc19c7f1c7fd83d0db47c2b2e4ad84187d2ad.tar.bz2
android_packages_apps_Gallery2-bb4cc19c7f1c7fd83d0db47c2b2e4ad84187d2ad.zip
fix video and music can be played at same time
requestAudioFocus() before play video in Gallery Change-Id: If70e51eb86d7d4379473cf5bd2185bed9bb03eaa
Diffstat (limited to 'src/com/android/gallery3d/app')
-rwxr-xr-xsrc/com/android/gallery3d/app/MoviePlayer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 06773f800..c79c44f93 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -579,6 +579,7 @@ public class MoviePlayer implements
boolean start) {
// For streams that we expect to be slow to start up, show a
// progress spinner until playback starts.
+ requestAudioFocus();
String scheme = mMovieItem.getUri().getScheme();
if ("http".equalsIgnoreCase(scheme) || "rtsp".equalsIgnoreCase(scheme)
|| "https".equalsIgnoreCase(scheme)) {
@@ -630,7 +631,7 @@ public class MoviePlayer implements
Log.w(TAG, "CS/CSVT Call is in progress, can't play video");
return false;
}
-
+ requestAudioFocus();
mTState = TState.PLAYING;
mVideoView.start();
mController.showPlaying();
@@ -808,6 +809,7 @@ public class MoviePlayer implements
mOverlayExt.setCanScrubbing(canSeek);
mController.setPlayPauseReplayResume();
if (!canPause && !mVideoView.isTargetPlaying()) {
+ requestAudioFocus();
mVideoView.start();
}
updateRewindAndForwardUI();