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 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1

Browse Source 
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
This commit is contained in:
Marco Nelissen
2017-06-06 23:33:50 +00:00
committed by android-build-merger
parent 7a06357519 e18e8c4113
commit 69b6a382a3
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() { 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;
@@ -297,8 +303,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;