Merge "Image Plane Proxy for Image Content Testability" into ub-camera-haleakala

diff --cc src/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
index 8f36270,3998f00..11ffc1c
--- 1/src/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
--- 2/src/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
+++ b/src/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
@@@ -190,15 -181,17 +196,13 @@@ public class TaskConvertImageToRGBPrevi
          int[] colors = new int[len];
          int alpha = 255 << 24;
  
 -        /*
 -         * Quick n' Dirty YUV to RGB conversion R = Y + 1.403V' G = Y - 0.344U'
 -         * - 0.714V' B = Y + 1.770U'
 -         */
  
-         Log.v(TAG, "TIMER_BEGIN Starting Native Java YUV420-to-RGB Quick n' Dirty Conversion 4");
-         Log.v(TAG, "\t Y-Plane Size=" + w + "x" + h);
-         Log.v(TAG,
-                 "\t U-Plane Size=" + img.getPlanes()[1].getRowStride() + " Pixel Stride="
-                         + img.getPlanes()[1].getPixelStride());
-         Log.v(TAG,
-                 "\t V-Plane Size=" + img.getPlanes()[2].getRowStride() + " Pixel Stride="
-                         + img.getPlanes()[2].getPixelStride());
+         logWrapper("TIMER_BEGIN Starting Native Java YUV420-to-RGB Quick n' Dirty Conversion 4");
+         logWrapper("\t Y-Plane Size=" + w + "x" + h);
+         logWrapper("\t U-Plane Size=" + planeList.get(1).getRowStride() + " Pixel Stride="
+                 + planeList.get(1).getPixelStride());
+         logWrapper("\t V-Plane Size=" + planeList.get(2).getRowStride() + " Pixel Stride="
+                 + planeList.get(2).getPixelStride());
          // Take in vertical lines by factor of two because of the u/v component
          // subsample
          for (int j = inscribedYMin; j < inscribedYMax; j += 2) {