commit 7c7214a98a198dead2d33d35350842f9c3655c6c
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 16 18:34:54 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 16 18:34:54 2017 +0000
tree 492c06e87563119fb810abfe4ab1c46ce0133d21
parent 19b86113d4c1b437fafea81cd1f014eb2e533227
parent 791cba479677ea3fc56c8b9608c16036504bc05c

Merge cherrypicks of [2420017, 2420032, 2420103, 2420142, 2420125, 2420126, 2420086, 2420018, 2420104, 2420162, 2420163, 2420164, 2420143, 2420019, 2420034, 2420055, 2420127, 2420128, 2420129, 2420020, 2420166, 2420167, 2420058, 2420131, 2420202, 2420108, 2420146, 2420109, 2420185, 2420111, 2420187, 2420113, 2420114, 2420059, 2420115] into nyc-mr2-security-b-release

Change-Id: I44473c25e0d3a6e15d2f4278d42eca4981d6f386

media/java/android/media/MediaHTTPConnection.java

diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java
index d6bf421..dda5ce6 100644
--- a/media/java/android/media/MediaHTTPConnection.java
+++ b/media/java/android/media/MediaHTTPConnection.java
@@ -135,7 +135,13 @@
 
     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 @@
             mCurrentOffset = offset;
         } catch (IOException e) {
             mTotalSize = -1;
-            mInputStream = null;
-            mConnection = null;
+            teardownConnection();
             mCurrentOffset = -1;
 
             throw e;