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

Commit 69b6a382 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:... 

Merge "Close connection before retrying" into lmp-dev am: a8648ece am: 5181a7ab am: 4b78a795 am: 6d5bc9a3 am: 3272cf26
am: e18e8c41

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
parents 7a063575 e18e8c41

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;