diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2013-12-11 10:31:29 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:20 -0700 |
| commit | 56c05c03f836d3e58860fef2d12c3623112b541c (patch) | |
| tree | 5cd2b1539adccef2eb53e0435d1bf2b73998c183 | |
| parent | ecd7f786a3aa0dbf27f483523f28654f9576a3cd (diff) | |
| download | android_packages_apps_Gallery2-56c05c03f836d3e58860fef2d12c3623112b541c.tar.gz android_packages_apps_Gallery2-56c05c03f836d3e58860fef2d12c3623112b541c.tar.bz2 android_packages_apps_Gallery2-56c05c03f836d3e58860fef2d12c3623112b541c.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
| -rw-r--r-- | 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 9b1f48fc1..709fa0fef 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -314,9 +314,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); } |