From b8858291c305e6ce666bb2bfb46ea49779466009 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Fri, 11 Apr 2014 10:39:53 +0800
Subject: 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
---
 src/com/android/gallery3d/app/MoviePlayer.java | 4 ++++
 1 file changed, 4 insertions(+)

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);
-- 
cgit v1.2.3