Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8e3352e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Gallery2: Set default value for server timeout"

parents 1c43f2ff ac731870

src/com/android/gallery3d/app/MoviePlayer.java

+5 −0
Original line number Diff line number Diff line
@@ -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);