diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2013-12-11 10:31:29 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-23 21:53:42 -0800 |
| commit | a61dd04626f156d65357f846bbc1d9be6ca224d7 (patch) | |
| tree | 75177fc572a7459ad92f7ce572027aaf142a6799 /src/com/android | |
| parent | 49c3de4b0da4377f58efa0ef113fff3d5a9f368e (diff) | |
| download | android_packages_apps_Gallery2-a61dd04626f156d65357f846bbc1d9be6ca224d7.tar.gz android_packages_apps_Gallery2-a61dd04626f156d65357f846bbc1d9be6ca224d7.tar.bz2 android_packages_apps_Gallery2-a61dd04626f156d65357f846bbc1d9be6ca224d7.zip | |
MoviePlayer: prevent resume dialog for live streaming
The player should not offer "resume playing" dialog for live
streaming when user navigates back to it.
(cherry picked from commit 3a16d7f019fc77c54ce38a137507ba5e5ac1ae8b)
Change-Id: I7fe6727ab884056a9135d1fa5ab21125570f70a3
CRs-Fixed: 637212
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/gallery3d/app/MoviePlayer.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 098fa79d8..e5874fd1c 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -300,9 +300,16 @@ public class MoviePlayer implements } else { mTState = TState.PLAYING; mFirstBePlayed = true; - final BookmarkerInfo bookmark = mBookmarker.getBookmark(mMovieItem.getUri()); - if (bookmark != null) { - showResumeDialog(movieActivity, bookmark); + String mUri = mMovieItem.getUri().toString(); + boolean isLive = mUri.startsWith("rtsp://") && (mUri.contains(".sdp") + || mUri.contains(".smil")); + if (!isLive) { + final BookmarkerInfo bookmark = mBookmarker.getBookmark(mMovieItem.getUri()); + if (bookmark != null) { + showResumeDialog(movieActivity, bookmark); + } else { + doStartVideo(false, 0, 0); + } } else { doStartVideo(false, 0, 0); } |