Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd925885 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

DO NOT MERGE: Hide new camera API. 

Not yet ready.

Bug: 11141002

Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
parent 6e19feb4

api/current.txt

+0 −402

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -2371,6 +2371,7 @@ public abstract class Context { 
     *

     * @see #getSystemService

     * @see android.hardware.camera2.CameraManager

     * @hide

     */

    public static final String CAMERA_SERVICE = "camera";

core/java/android/hardware/camera2/package.html

+2 −0
Original line number Diff line number Diff line
@@ -80,5 +80,7 @@ output streams included in the request. These are produced 
asynchronously relative to the output CaptureResult, sometimes

substantially later.</p>



{@hide}



</BODY>

</HTML>

graphics/java/android/graphics/ImageFormat.java

+2 −4
Original line number Diff line number Diff line
@@ -187,10 +187,6 @@ public class ImageFormat { 
     * == {@link android.media.Image.Plane#getPixelStride() vPlane.getPixelStride()};

     * ).</p>

     *

     * <p>For example, the {@link android.media.Image} object can provide data

     * in this format from a {@link android.hardware.camera2.CameraDevice}

     * through a {@link android.media.ImageReader} object.</p>

     *

     * @see android.media.Image

     * @see android.media.ImageReader

     * @see android.hardware.camera2.CameraDevice
@@ -207,6 +203,8 @@ public class ImageFormat { 
     * needed information to interpret a raw sensor image must be queried from

     * the {@link android.hardware.camera2.CameraDevice} which produced the

     * image.</p>

     *

     * @hide

     */

    public static final int RAW_SENSOR = 0x20;

media/java/android/media/Image.java

+1 −11
Original line number Diff line number Diff line
@@ -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