diff options
author | kaiyiz <kaiyiz@codeaurora.org> | 2014-11-18 18:09:46 +0800 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2014-12-15 14:56:13 -0800 |
commit | 7be87f77ae1480f4d4e36d0fca85c11354d2f672 (patch) | |
tree | 6d0679055b16afc0cddd0dc5cc187b3bcc3627d0 | |
parent | 98b9fb070d28e318f777f6660ea6546218453a34 (diff) | |
download | android_packages_apps_Gallery2-7be87f77ae1480f4d4e36d0fca85c11354d2f672.tar.gz android_packages_apps_Gallery2-7be87f77ae1480f4d4e36d0fca85c11354d2f672.tar.bz2 android_packages_apps_Gallery2-7be87f77ae1480f4d4e36d0fca85c11354d2f672.zip |
Gallery2: Set default value for server timeout
The timeout of server is not set when read from flag of SERVER_TIMEOUT,
the value will stay to be -1, as a result there will be no resume dialog
Set a default value of 3 min for resume timeout
CRs-Fixed: 753834
Change-Id: Icd4640c4b56a64857dfade1bb8d7a3581494d404
-rwxr-xr-x | src/com/android/gallery3d/app/MoviePlayer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index d71df0844..098fa79d8 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1268,6 +1268,7 @@ public class MoviePlayer implements private long mLastDisconnectTime; private boolean mIsShowDialog = false; private AlertDialog mServerTimeoutDialog; + private int RESUME_DIALOG_TIMEOUT = 3 * 60 * 1000; // 3 mins // check whether disconnect from server timeout or not. // if timeout, return false. otherwise, return true. @@ -1390,8 +1391,12 @@ public class MoviePlayer implements } public void setVideoInfo(Metadata data) { + mServerTimeout = RESUME_DIALOG_TIMEOUT; if (data.has(SERVER_TIMEOUT)) { mServerTimeout = data.getInt(SERVER_TIMEOUT); + if (mServerTimeout == 0) { + mServerTimeout = RESUME_DIALOG_TIMEOUT; + } if (LOG) { Log.v(TAG, "get server timeout from metadata. mServerTimeout=" + mServerTimeout); |