diff options
| author | Likai Ding <likaid@codeaurora.org> | 2014-04-11 10:39:53 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:20 -0700 |
| commit | b8858291c305e6ce666bb2bfb46ea49779466009 (patch) | |
| tree | 57456d2b8b3af33922bfcf317b2ae5bd89d5e8a9 | |
| parent | f92a9bef39db56ec6ed325e917ac0fd7b50a2677 (diff) | |
| download | android_packages_apps_Gallery2-b8858291c305e6ce666bb2bfb46ea49779466009.tar.gz android_packages_apps_Gallery2-b8858291c305e6ce666bb2bfb46ea49779466009.tar.bz2 android_packages_apps_Gallery2-b8858291c305e6ce666bb2bfb46ea49779466009.zip | |
MoviePlayer: add default server timeout
The patch provides a default server timeout, in case of server not
supplying the value or lacking low-level support, for better carrier
requirements compliance.
Change-Id: I5ad83ed5bcea814405e54b8d75d9612d607a3973
CRs-Fixed: 638087
| -rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 9a1730b75..045bfcf83 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1426,8 +1426,12 @@ public class MoviePlayer implements } public void setVideoInfo(Metadata data) { + mServerTimeout = DEFAULT_SERVER_TIMEOUT; if (data.has(SERVER_TIMEOUT)) { mServerTimeout = data.getInt(SERVER_TIMEOUT); + if (mServerTimeout == 0) { + mServerTimeout = DEFAULT_SERVER_TIMEOUT; + } if (LOG) { Log.v(TAG, "get server timeout from metadata. mServerTimeout=" + mServerTimeout); |