commit 8fe23dfeffa3e85afc9c36a7706dcad4173b41b9
author Josh Gao <jmgao@google.com> Mon Nov 12 20:34:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 12 20:34:21 2018 +0000
tree a2ee4fc6dde0dd205fba2cafc12490032797540f
parent bc12083aa717caf770f751b09a8548535408101e
parent 401fb2485aac4ecf44921706a3476f0fcaedc035

Merge "Close PFD.AutoClose{In,Out}putStream before the PFD itself."

core/java/android/os/ParcelFileDescriptor.java

diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java
index c9edc53..7409ca7 100644
--- a/core/java/android/os/ParcelFileDescriptor.java
+++ b/core/java/android/os/ParcelFileDescriptor.java
@@ -917,9 +917,9 @@
         @Override
         public void close() throws IOException {
             try {
-                mPfd.close();
-            } finally {
                 super.close();
+            } finally {
+                mPfd.close();
             }
         }
 
@@ -968,9 +968,9 @@
         @Override
         public void close() throws IOException {
             try {
-                mPfd.close();
-            } finally {
                 super.close();
+            } finally {
+                mPfd.close();
             }
         }
     }