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

Commit 4b19de0e authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-team Robot
Browse files

Close connection before retrying 

Otherwise the (CTS) server might run out of connections.
Bug: 38391487
Bug: 22771132
Test: build, run CTS, stream music

Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
(cherry picked from commit 46132afe)
parent 66cb6dc1

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;