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

Commit 6d5bc9a3 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Close connection before retrying" into lmp-dev am: a8648ece am: 5181a7ab 

am: 4b78a795

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
parents 47beaa8f 4b78a795

media/java/android/media/MediaHTTPConnection.java

+8 −3
Original line number Diff line number Diff line
@@ -135,7 +135,13 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { 


    private void teardownConnection() {

        if (mConnection != null) {

            if (mInputStream != null) {

                try {

                    mInputStream.close();

                } catch (IOException e) {

                }

                mInputStream = null;

            }



            mConnection.disconnect();

            mConnection = null;
@@ -297,8 +303,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { 
            mCurrentOffset = offset;

        } catch (IOException e) {

            mTotalSize = -1;

            mInputStream = null;

            mConnection = null;

            teardownConnection();

            mCurrentOffset = -1;



            throw e;