summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-04-02 17:42:45 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:20 -0700
commitb984156d4f4e30154e2c8e327098a7238f64b6c3 (patch)
tree78794a86538b48514c6bd44302a0bf935c4454e3
parenta1f2e8ec818fc6f06b974bcce8bdfc85e1635cc9 (diff)
downloadandroid_packages_apps_Gallery2-b984156d4f4e30154e2c8e327098a7238f64b6c3.tar.gz
android_packages_apps_Gallery2-b984156d4f4e30154e2c8e327098a7238f64b6c3.tar.bz2
android_packages_apps_Gallery2-b984156d4f4e30154e2c8e327098a7238f64b6c3.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: I4b32478823f0e0226aac3098e4ac7e7ea064a73c CRs-Fixed: 638087
-rw-r--r--src/com/android/gallery3d/app/MoviePlayer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 709fa0fef..89e9a2fee 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -1304,6 +1304,7 @@ public class MoviePlayer implements
private long mLastDisconnectTime;
private boolean mIsShowDialog = false;
private AlertDialog mServerTimeoutDialog;
+ private static final int DEFAULT_SERVER_TIMEOUT = 600000;
// check whether disconnect from server timeout or not.
// if timeout, return false. otherwise, return true.
@@ -1432,6 +1433,8 @@ public class MoviePlayer implements
Log.v(TAG, "get server timeout from metadata. mServerTimeout="
+ mServerTimeout);
}
+ } else {
+ mServerTimeout = DEFAULT_SERVER_TIMEOUT;
}
}