summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-09 12:37:29 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-09 12:37:29 -0800
commit9ffe06150462488e9d879a8847f7e3827d5b074a (patch)
treee19d5d9c27adf8db2d22acfba1772f14b666dd06 /src/com
parentc9bee6423252ba1eedc6b6d9a5a86b953aac7de6 (diff)
parent6c43863efdc8ecaf5915c21d8722305db69fc78a (diff)
downloadandroid_packages_apps_Snap-9ffe06150462488e9d879a8847f7e3827d5b074a.tar.gz
android_packages_apps_Snap-9ffe06150462488e9d879a8847f7e3827d5b074a.tar.bz2
android_packages_apps_Snap-9ffe06150462488e9d879a8847f7e3827d5b074a.zip
Merge "SnapdragonCamera: fix preview not shown bug"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/PhotoUI.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index bad7073a9..81837f68f 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -390,6 +390,8 @@ public class PhotoUI implements PieListener,
}
} else {
float width = mOriginalPreviewWidth, height = mOriginalPreviewHeight;
+ if (width == 0 || height == 0) return;
+
if (mOrientationResize) {
scaledTextureWidth = height * mAspectRatio;
if (scaledTextureWidth > width) {