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

Commit 4cabe3ea authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev

parents 4359d564 af753a2d

media/java/android/media/Image.java

+5 −5
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ public interface Image extends AutoCloseable { 
     * the planes is as follows:

     *

     * <table>

     * <th>

     *   <td>Format</td>

     *   <td>Plane count</td>

     *   <td>Layout details</td>

     * </th>

     * <tr>

     *   <th>Format</th>

     *   <th>Plane count</th>

     *   <th>Layout details</th>

     * </tr>

     * <tr>

     *   <td>{@link android.graphics.ImageFormat#JPEG}</td>

     *   <td>1</td>

media/jni/android_media_ImageReader.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) )



#define ANDROID_MEDIA_IMAGEREADER_JNI_ID           "mCpuConsumer"

#define ANDROID_MEDIA_IMAGEREADER_CTX_JNI_ID       "mNativeContext"

#define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID   "mLockedBuffer"

#define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID       "mTimestamp"