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

2013-08-23 18:49:42 +00:00
parent 4359d56420 af753a2dfc
commit 4cabe3eae8
2 changed files with 5 additions and 6 deletions
--- a/media/java/android/media/Image.java
+++ b/media/java/android/media/Image.java
@ -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>
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@ -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"