Fix black screen when viewing Gmail image file attachment.

Bug: 6415848

Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84

diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java
index ac0d191..03fe65b 100644 (file)
--- a/src/com/android/gallery3d/ui/PositionController.java
+++ b/src/com/android/gallery3d/ui/PositionController.java
@@ -1012,7 +1012,8 @@ class PositionController {
         float hFactor = 1.0f;
         int viewW, viewH;
 
-        if (!mFilmMode && mConstrained && b == mBoxes.get(0)) {
+        if (!mFilmMode && mConstrained && !mConstrainedFrame.isEmpty()
+                && b == mBoxes.get(0)) {
             viewW = mConstrainedFrame.width();
             viewH = mConstrainedFrame.height();
         } else {