Fix http://b/1991523 by limiting the size of a bitmap when we decode a full image.

computeSampleSize() now accepts not only targetWidthOrHeight but also the size of a bitmap.

1 files changed, 2 insertions, 7 deletions

diff --git a/tests/src/com/android/camera/gallery/MockImage.java b/tests/src/com/android/camera/gallery/MockImage.java
index 16d80ea..97d51b6 100644
--- a/tests/src/com/android/camera/gallery/MockImage.java
+++ b/tests/src/com/android/camera/gallery/MockImage.java
@@ -20,20 +20,15 @@ public class MockImage implements IImage {
         this.mContainer = container;
     }
 
-    public Bitmap fullSizeBitmap(int targetWidthOrHeight) {
+    public Bitmap fullSizeBitmap(int minSideLength, int maxNumberOfPixels) {
         return null;
     }
 
-    public Bitmap fullSizeBitmap(int targetWidthOrHeight,
+    public Bitmap fullSizeBitmap(int minSideLength, int maxNumberOfPixels,
             boolean rotateAsNeeded, boolean useNative) {
         return null;
     }
 
-    public Cancelable<Bitmap> fullSizeBitmapCancelable(int targetWidthOrHeight,
-            BitmapFactory.Options options) {
-        return null;
-    }
-
     public InputStream fullSizeImageData() {
         return null;
     }