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

Commit 60c36f8c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2413849, 2413760, 2413901, 2413776, 2413658, 2413792,... 

Merge cherrypicks of [2413849, 2413760, 2413901, 2413776, 2413658, 2413792, 2413850, 2413851, 2413793, 2413866, 2413738, 2413659, 2413660, 2413867, 2413868, 2413885, 2413829, 2413814, 2413886, 2413921, 2413777, 2413887, 2413854, 2413889, 2413890, 2413855, 2413869, 2413740, 2413816, 2413831, 2413832, 2413817, 2413892, 2413797, 2413779] into nyc-mr2-pixel-monthly-release

Change-Id: Ie45c0ee51a7a5d2f9ba6718011d7fc3461825584
parents 66cb6dc1 4b19de0e

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;