Merge "Close PFD.AutoClose{In,Out}putStream before the PFD itself." am: 8fe23dfeff am: dcf129f380 (bd1db802) · Commits · e / os / android_frameworks_base

core/java/android/os/ParcelFileDescriptor.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -881,9 +881,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
		@Override
		public void close() throws IOException {
		try {
		mPfd.close();
		} finally {
		super.close();
		} finally {
		mPfd.close();
		}
		}

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