Merge "Close PFD.AutoClose{In,Out}putStream before the PFD itself." am: 8fe23dfeff

am: dcf129f380

Change-Id: I6926ff23f7360ba2acf2b87dff1b20c548d7d0d4

core/java/android/os/ParcelFileDescriptor.java

@@ -917,9 +917,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
         @Override
         public void close() throws IOException {
             try {
-                mPfd.close();
-            } finally {
                 super.close();
+            } finally {
+                mPfd.close();
             }
         }
 
@@ -968,9 +968,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
         @Override
         public void close() throws IOException {
             try {
-                mPfd.close();
-            } finally {
                 super.close();
+            } finally {
+                mPfd.close();
             }
         }
     }