diff options
author | Marco Nelissen <marcone@google.com> | 2017-06-02 12:16:44 -0700 |
---|---|---|
committer | Ivan Kutepov <its.kutepov@gmail.com> | 2017-08-13 19:23:44 +0300 |
commit | f579e002869f3d066b848eb5525bba0dd76f92a1 (patch) | |
tree | 32a09d0ce51d05d9ac69c1ac3be2db480cc20e91 | |
parent | 52a095471c639d5076d731d9f06554d08bda5c25 (diff) | |
download | frameworks_base-f579e002869f3d066b848eb5525bba0dd76f92a1.tar.gz frameworks_base-f579e002869f3d066b848eb5525bba0dd76f92a1.tar.bz2 frameworks_base-f579e002869f3d066b848eb5525bba0dd76f92a1.zip |
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 46132afee7783665ae12538edd024770dbd93ecb)
-rw-r--r-- | media/java/android/media/MediaHTTPConnection.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java index 59eaeef1e29..dbd5b41ae0e 100644 --- a/media/java/android/media/MediaHTTPConnection.java +++ b/media/java/android/media/MediaHTTPConnection.java @@ -157,7 +157,13 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { private void teardownConnection() { if (mConnection != null) { - mInputStream = null; + if (mInputStream != null) { + try { + mInputStream.close(); + } catch (IOException e) { + } + mInputStream = null; + } mConnection.disconnect(); mConnection = null; @@ -346,8 +352,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { mCurrentOffset = offset; } catch (IOException e) { mTotalSize = -1; - mInputStream = null; - mConnection = null; + teardownConnection(); mCurrentOffset = -1; throw e; |