am e48113b9: Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo

Merge commit 'e48113b9c8e2117086eb9107f28af48443eba1bc' into froyo-plus-aosp

* commit 'e48113b9c8e2117086eb9107f28af48443eba1bc':
  Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails.

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index 593de978365..98ad62e800b 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -35,6 +35,7 @@ import android.provider.MediaStore;
 import android.provider.MediaStore.Images.Media;
 import android.provider.MediaStore.Images.Thumbnails;
 import android.test.InstrumentationTestCase;
+import android.util.Log;
 
 import java.util.ArrayList;
 
@@ -160,14 +161,14 @@ public class MediaStore_Images_ThumbnailsTest extends InstrumentationTestCase {
         c = Thumbnails.queryMiniThumbnail(mContentResolver, imageId, Thumbnails.MINI_KIND,
                 sizeProjection);
         assertEquals(1, c.getCount());
-        c.moveToFirst();
-        assertEquals(320, c.getLong(c.getColumnIndex(Thumbnails.WIDTH)));
-        assertEquals(240, c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)));
+        assertTrue(c.moveToFirst());
+        assertTrue(c.getLong(c.getColumnIndex(Thumbnails.WIDTH)) >= Math.min(src.getWidth(), 240));
+        assertTrue(c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)) >= Math.min(src.getHeight(), 240));
         c.close();
         c = Thumbnails.queryMiniThumbnail(mContentResolver, imageId, Thumbnails.MICRO_KIND,
                 sizeProjection);
         assertEquals(1, c.getCount());
-        c.moveToFirst();
+        assertTrue(c.moveToFirst());
         assertEquals(50, c.getLong(c.getColumnIndex(Thumbnails.WIDTH)));
         assertEquals(50, c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)));
         c.close();