Merge "DNG: Hide unimplemented methods." into lmp-preview-dev (35677d17) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -12600,14 +12600,7 @@ package android.hardware.camera2 {
		public final class DngCreator implements java.lang.AutoCloseable {
		ctor public DngCreator(android.hardware.camera2.CameraCharacteristics, android.hardware.camera2.CaptureResult);
		method public void close();
		method public android.hardware.camera2.DngCreator setDescription(java.lang.String);
		method public android.hardware.camera2.DngCreator setLocation(android.location.Location);
		method public android.hardware.camera2.DngCreator setOrientation(int);
		method public android.hardware.camera2.DngCreator setThumbnail(android.graphics.Bitmap);
		method public android.hardware.camera2.DngCreator setThumbnail(android.media.Image);
		method public void writeByteBuffer(java.io.OutputStream, android.util.Size, java.nio.ByteBuffer, long) throws java.io.IOException;
		method public void writeImage(java.io.OutputStream, android.media.Image) throws java.io.IOException;
		method public void writeInputStream(java.io.OutputStream, android.util.Size, java.io.InputStream, long) throws java.io.IOException;
		}

		public final class TotalCaptureResult extends android.hardware.camera2.CaptureResult {

core/java/android/hardware/camera2/DngCreator.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ public final class DngCreator implements AutoCloseable {
		* <li>{@link android.media.ExifInterface#ORIENTATION_ROTATE_270}</li>
		* </ul>
		* @return this {@link #DngCreator} object.
		* @hide
		*/
		public DngCreator setOrientation(int orientation) {

		@@ -147,6 +148,7 @@ public final class DngCreator implements AutoCloseable {
		*
		* @param pixels a {@link android.graphics.Bitmap} of pixel data.
		* @return this {@link #DngCreator} object.
		* @hide
		*/
		public DngCreator setThumbnail(Bitmap pixels) {
		if (pixels == null) {
		@@ -180,6 +182,7 @@ public final class DngCreator implements AutoCloseable {
		* @param pixels an {@link android.media.Image} object with the format
		* {@link android.graphics.ImageFormat#YUV_420_888}.
		* @return this {@link #DngCreator} object.
		* @hide
		*/
		public DngCreator setThumbnail(Image pixels) {
		if (pixels == null) {
		@@ -216,6 +219,7 @@ public final class DngCreator implements AutoCloseable {
		*
		* @throws java.lang.IllegalArgumentException if the given location object doesn't
		* contain enough information to set location metadata.
		* @hide
		*/
		public DngCreator setLocation(Location location) {
		/TODO/
		@@ -231,6 +235,7 @@ public final class DngCreator implements AutoCloseable {
		*
		* @param description the user description string.
		* @return this {@link #DngCreator} object.
		* @hide
		*/
		public DngCreator setDescription(String description) {
		/TODO/
		@@ -263,6 +268,7 @@ public final class DngCreator implements AutoCloseable {
		* @throws java.lang.IllegalStateException if not enough metadata information has been
		* set to write a well-formatted DNG file.
		* @throws java.lang.IllegalArgumentException if the size passed in does not match the
		* @hide
		*/
		public void writeInputStream(OutputStream dngOutput, Size size, InputStream pixels, long offset)
		throws IOException {
		@@ -297,6 +303,7 @@ public final class DngCreator implements AutoCloseable {
		* @throws IOException if an error was encountered in the input or output stream.
		* @throws java.lang.IllegalStateException if not enough metadata information has been
		* set to write a well-formatted DNG file.
		* @hide
		*/
		public void writeByteBuffer(OutputStream dngOutput, Size size, ByteBuffer pixels, long offset)
		throws IOException {