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

Commit 2c1d4f8f 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 am: 69b6a382 am: ce5c72e8 am: 4d9e6150 am: d7fe3ea6 am: db9d2588
am: 9e4e6c4b

Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
parents 3946916d 9e4e6c4b

media/java/android/media/MediaHTTPConnection.java

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




    private void teardownConnection() {

    private void teardownConnection() {

        if (mConnection != null) {

        if (mConnection != null) {

            if (mInputStream != null) {

                try {

                    mInputStream.close();

                } catch (IOException e) {

                }

                mInputStream = null;

                mInputStream = null;

            }





            mConnection.disconnect();

            mConnection.disconnect();

            mConnection = null;

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

            mCurrentOffset = offset;

        } catch (IOException e) {

        } catch (IOException e) {

            mTotalSize = -1;

            mTotalSize = -1;

            mInputStream = null;

            teardownConnection();

            mConnection = null;

            mCurrentOffset = -1;

            mCurrentOffset = -1;





            throw e;

            throw e;