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

Commit 02908be2 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r29' into cm-14.1 

Android 7.1.2 Release 29 (NJH47F)

# gpg: Signature made Fri Jul 28 13:56:01 2017 CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents f0e6c567 60c36f8c

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;