From b2b382bf30ed6438a1eac9b00261659ad588eaa3 Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Wed, 3 Feb 2016 15:13:49 -0800
Subject: SnapdragonCamera: fix null pointer exception

During layout change, it is possible camera preview is not
configured, yet and Camera.Parameters.getPreviewSize()
returns null pointer. Adding a null check to skip the layout
change if the pointer is null

Change-Id: Icb3ecf60c261e68cc5f2b05eba4df020857022eb
CRs-Fixed: 945969
---
 src/com/android/camera/PhotoUI.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera/PhotoUI.java')

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index a7aebfb17..970e2e5c9 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -165,7 +165,9 @@ public class PhotoUI implements PieListener,
             Camera.Parameters parameters = ((PhotoModule)mController).getParameters();
             if(parameters != null) {
                 Camera.Size size = parameters.getPreviewSize();
-                setAspectRatio((float) size.width / size.height);
+                if (size != null) {
+                    setAspectRatio((float) size.width / size.height);
+                }
             }
         }
     };
-- 
cgit v1.2.3