Merge "Richer ParcelFileDescriptor close events." into klp-dev (d1da6701) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −2

Original line number	Diff line number	Diff line
		@@ -18113,8 +18113,14 @@ package android.os {
		public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {
		ctor public ParcelFileDescriptor(android.os.ParcelFileDescriptor);
		method public static android.os.ParcelFileDescriptor adoptFd(int);
		method public boolean canDetectErrors();
		method public void checkError(boolean) throws java.io.IOException;
		method public void close() throws java.io.IOException;
		method public void closeWithError(java.lang.String) throws java.io.IOException;
		method public static android.os.ParcelFileDescriptor[] createPipe() throws java.io.IOException;
		method public static android.os.ParcelFileDescriptor[] createReliablePipe() throws java.io.IOException;
		method public static android.os.ParcelFileDescriptor[] createReliableSocketPair() throws java.io.IOException;
		method public static android.os.ParcelFileDescriptor[] createSocketPair() throws java.io.IOException;
		method public int describeContents();
		method public int detachFd();
		method public static android.os.ParcelFileDescriptor dup(java.io.FileDescriptor) throws java.io.IOException;
		@@ -18126,6 +18132,7 @@ package android.os {
		method public java.io.FileDescriptor getFileDescriptor();
		method public long getStatSize();
		method public static android.os.ParcelFileDescriptor open(java.io.File, int) throws java.io.FileNotFoundException;
		method public static android.os.ParcelFileDescriptor open(java.io.File, int, android.os.Handler, android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final int MODE_APPEND = 33554432; // 0x2000000
		@@ -18133,8 +18140,8 @@ package android.os {
		field public static final int MODE_READ_ONLY = 268435456; // 0x10000000
		field public static final int MODE_READ_WRITE = 805306368; // 0x30000000
		field public static final int MODE_TRUNCATE = 67108864; // 0x4000000
		field public static final int MODE_WORLD_READABLE = 1; // 0x1
		field public static final int MODE_WORLD_WRITEABLE = 2; // 0x2
		field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
		field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2
		field public static final int MODE_WRITE_ONLY = 536870912; // 0x20000000
		}

		@@ -18146,6 +18153,10 @@ package android.os {
		ctor public ParcelFileDescriptor.AutoCloseOutputStream(android.os.ParcelFileDescriptor);
		}

		public static abstract interface ParcelFileDescriptor.OnCloseListener {
		method public abstract void onClose(java.io.IOException, boolean);
		}

		public class ParcelFormatException extends java.lang.RuntimeException {
		ctor public ParcelFormatException();
		ctor public ParcelFormatException(java.lang.String);

core/java/android/content/ContentResolver.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -2060,7 +2060,7 @@ public abstract class ContentResolver {

		private final class ParcelFileDescriptorInner extends ParcelFileDescriptor {
		private final IContentProvider mContentProvider;
		private boolean mReleaseProviderFlag = false;
		private boolean mProviderReleased;

		ParcelFileDescriptorInner(ParcelFileDescriptor pfd, IContentProvider icp) {
		super(pfd);
		@@ -2069,17 +2069,10 @@ public abstract class ContentResolver {

		@Override
		public void close() throws IOException {
		if(!mReleaseProviderFlag) {
		super.close();
		if (!mProviderReleased) {
		ContentResolver.this.releaseProvider(mContentProvider);
		mReleaseProviderFlag = true;
		}
		}

		@Override
		protected void finalize() throws Throwable {
		if (!mReleaseProviderFlag) {
		close();
		mProviderReleased = true;
		}
		}
		}

core/java/android/os/Parcel.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1520,6 +1520,11 @@ public final class Parcel {
		return fd != null ? new ParcelFileDescriptor(fd) : null;
		}

		/** {@hide} */
		public final FileDescriptor readRawFileDescriptor() {
		return nativeReadFileDescriptor(mNativePtr);
		}

		/package/ static native FileDescriptor openFileDescriptor(String file,
		int mode) throws FileNotFoundException;
		/package/ static native FileDescriptor dupFileDescriptor(FileDescriptor orig)

core/java/android/os/ParcelFileDescriptor.java

+635 −109

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ LOCAL_SRC_FILES:= \
		android_os_FileUtils.cpp \
		android_os_MemoryFile.cpp \
		android_os_MessageQueue.cpp \
		android_os_ParcelFileDescriptor.cpp \
		android_os_Parcel.cpp \
		android_os_SELinux.cpp \
		android_os_SystemClock.cpp \