From cd925885283396c0379ec2dcaa94e318993f40f8 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Mon, 7 Oct 2013 13:24:52 -0700
Subject: DO NOT MERGE: Hide new camera API.

Not yet ready.

Bug: 11141002

Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
---
 media/java/android/media/Image.java       | 12 +-----------
 media/java/android/media/ImageReader.java |  3 +--
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'media')

diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java
index a346e17..23abce7 100644
--- a/media/java/android/media/Image.java
+++ b/media/java/android/media/Image.java
@@ -21,8 +21,7 @@ import java.lang.AutoCloseable;
 
 /**
  * <p>A single complete image buffer to use with a media source such as a
- * {@link MediaCodec} or a
- * {@link android.hardware.camera2.CameraDevice CameraDevice}.</p>
+ * {@link MediaCodec}.</p>
  *
  * <p>This class allows for efficient direct application access to the pixel
  * data of the Image through one or more
@@ -83,15 +82,6 @@ public abstract class Image implements AutoCloseable {
      *     plane (4:2:0 subsampling). Each pixel sample in each plane has 8 bits.
      *     Each plane has its own row stride and pixel stride.</td>
      * </tr>
-     * <tr>
-     *   <td>{@link android.graphics.ImageFormat#RAW_SENSOR RAW_SENSOR}</td>
-     *   <td>1</td>
-     *   <td>A single plane of raw sensor image data, with 16 bits per color
-     *     sample. The details of the layout need to be queried from the source of
-     *     the raw sensor data, such as
-     *     {@link android.hardware.camera2.CameraDevice CameraDevice}.
-     *   </td>
-     * </tr>
      * </table>
      *
      * @see android.graphics.ImageFormat
diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index 1bd32c4..d454c42 100644
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -32,8 +32,7 @@ import java.nio.ByteOrder;
  * rendered into a {@link android.view.Surface}</p>
  *
  * <p>Several Android media API classes accept Surface objects as targets to
- * render to, including {@link MediaPlayer}, {@link MediaCodec},
- * {@link android.hardware.camera2.CameraDevice}, and
+ * render to, including {@link MediaPlayer}, {@link MediaCodec}, and
  * {@link android.renderscript.Allocation RenderScript Allocations}. The image
  * sizes and formats that can be used with each source vary, and should be
  * checked in the documentation for the specific API.</p>
-- 
cgit v1.1