Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Close connection before retrying" into lmp-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-06 22:53:55 +00:00
committed by Android (Google) Code Review
parent 4911af2b8c 46132afee7
commit a8648ecebb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/MediaHTTPConnection.java
View File

@@ -130,7 +130,13 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
private void teardownConnection() { private void teardownConnection() {
if (mConnection != null) { if (mConnection != null) {
mInputStream = null; if (mInputStream != null) {
try {
mInputStream.close();
} catch (IOException e) {
}
mInputStream = null;
}
mConnection.disconnect(); mConnection.disconnect();
mConnection = null; mConnection = null;
@@ -291,8 +297,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;