diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-20 22:48:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-20 22:48:39 -0800 |
| commit | f8e3352ea6759dd760f28017c4789a20731e2ee4 (patch) | |
| tree | 23d4cf792c86cbe6999c2fe5cc3bda2cbef01d5d /src | |
| parent | 1c43f2ffc4f6e3b67f57a92395a7b34a4ed4f3ae (diff) | |
| parent | ac7318705c825a9ce6199c301b3fda7a4d25ee6d (diff) | |
| download | android_packages_apps_Gallery2-f8e3352ea6759dd760f28017c4789a20731e2ee4.tar.gz android_packages_apps_Gallery2-f8e3352ea6759dd760f28017c4789a20731e2ee4.tar.bz2 android_packages_apps_Gallery2-f8e3352ea6759dd760f28017c4789a20731e2ee4.zip | |
Merge "Gallery2: Set default value for server timeout"
Diffstat (limited to 'src')
| -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 f35d172fc..65a485009 100755 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1262,6 +1262,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. @@ -1384,8 +1385,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); |