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 am: a8648ecebb

Browse Source 
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
This commit is contained in:
Marco Nelissen
2017-06-06 23:10:16 +00:00
committed by android-build-merger
parent 8965cd6a39 5181a7ab64
commit 4b78a79546
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

@@ -131,7 +131,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;
@@ -292,8 +298,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;