Merge "Add hidden support for arrays of raw file descriptors" (376d5f35) · Commits · e / os / android_frameworks_base

core/java/android/os/Parcel.java

+61 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,32 @@ public final class Parcel {
		nativeWriteFileDescriptor(mNativePtr, val);
		}

		/**
		* {@hide}
		* This will be the new name for writeFileDescriptor, for consistency.
		**/
		public final void writeRawFileDescriptor(FileDescriptor val) {
		nativeWriteFileDescriptor(mNativePtr, val);
		}

		/**
		* {@hide}
		* Write an array of FileDescriptor objects into the Parcel.
		*
		* @param value The array of objects to be written.
		*/
		public final void writeRawFileDescriptorArray(FileDescriptor[] value) {
		if (value != null) {
		int N = value.length;
		writeInt(N);
		for (int i=0; i<N; i++) {
		writeRawFileDescriptor(value[i]);
		}
		} else {
		writeInt(-1);
		}
		}

		/**
		* Write a byte value into the parcel at the current dataPosition(),
		* growing dataCapacity() if needed.
		@@ -1679,6 +1705,41 @@ public final class Parcel {
		return nativeReadFileDescriptor(mNativePtr);
		}

		/**
		* {@hide}
		* Read and return a new array of FileDescriptors from the parcel.
		* @return the FileDescriptor array, or null if the array is null.
		**/
		public final FileDescriptor[] createRawFileDescriptorArray() {
		int N = readInt();
		if (N < 0) {
		return null;
		}
		FileDescriptor[] f = new FileDescriptor[N];
		for (int i = 0; i < N; i++) {
		f[i] = readRawFileDescriptor();
		}
		return f;
		}

		/**
		* {@hide}
		* Read an array of FileDescriptors from a parcel.
		* The passed array must be exactly the length of the array in the parcel.
		* @return the FileDescriptor array, or null if the array is null.
		**/
		public final void readRawFileDescriptorArray(FileDescriptor[] val) {
		int N = readInt();
		if (N == val.length) {
		for (int i=0; i<N; i++) {
		val[i] = readRawFileDescriptor();
		}
		} else {
		throw new RuntimeException("bad array lengths");
		}
		}


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