From 9e6d073a999d7934aa3f22a5877c6e8e2ce15766 Mon Sep 17 00:00:00 2001
From: Zhijun He <zhijunhe@google.com>
Date: Mon, 16 Sep 2013 16:03:36 -0700
Subject: [PATCH] ImageReader: fix the 0 crop rect size issue

Rect isValid actually include the zero size case, which we don't want to include
in our case. This causes camera ImageReader test case fails at buffer size
sanity check.

Bug: 9802344
Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
---
 media/jni/android_media_ImageReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index fb0f69b72810a..a03dbf325e500 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -737,7 +737,7 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz,
     int outputHeight = buffer->height;
 
     // Correct width/height when crop is set.
-    if (buffer->crop.isValid()) {
+    if (!buffer->crop.isEmpty()) {
         outputWidth = buffer->crop.getWidth();
         outputHeight = buffer->crop.getHeight();
     }