summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChao Zhang <chaoz@codeaurora.org>2016-02-03 19:04:35 +0800
committerSteve Kondik <steve@cyngn.com>2016-09-26 04:54:48 -0700
commit2bb86a6084ac7c4bb332b7d625fbab7ccfbe40c1 (patch)
treec93534046e5975fa740559f250b71d53b359c471
parent8ab627048e551b3ba76e67f623db3c94ba63dfcd (diff)
downloadandroid_packages_apps_Gallery2-2bb86a6084ac7c4bb332b7d625fbab7ccfbe40c1.tar.gz
android_packages_apps_Gallery2-2bb86a6084ac7c4bb332b7d625fbab7ccfbe40c1.tar.bz2
android_packages_apps_Gallery2-2bb86a6084ac7c4bb332b7d625fbab7ccfbe40c1.zip
Gallery2: fix server timeout prompt not shown if mStreamingType is HTTP.
isFullBuffer() will return true if mStreamingType is STREAMING_HTTP. add STREAMING_HTTP judgement in isFullBuffer(). Change-Id: I520f567f35ed05b735c3a0a5db5cd16e3af75569 CRs-Fixed: 969149
-rwxr-xr-xsrc/com/android/gallery3d/app/MoviePlayer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 9536190d1..4b1e8686e 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -969,7 +969,8 @@ public class MoviePlayer implements
}
public boolean isFullBuffer() {
- if (mStreamingType == STREAMING_RTSP || mStreamingType == STREAMING_SDP) {
+ if (mStreamingType == STREAMING_RTSP || mStreamingType == STREAMING_SDP
+ || mStreamingType == STREAMING_HTTP) {
return false;
}
return true;