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 am: 5181a7ab64

Browse Source 
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
This commit is contained in:
Marco Nelissen
2017-06-06 23:16:24 +00:00
committed by android-build-merger
parent 47beaa8fab 4b78a79546
commit 6d5bc9a3c2
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

@@ -135,7 +135,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;
@@ -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;