From da5b9aba75146a33248af3f0ecea6fd85b3e1f50 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 22 Jan 2013 13:05:34 -0800
Subject: Prevent call to getSurfaceTexture after startPreview() is canceled.

 Bug 7990250

Change-Id: Ic57192e88eb4418d98d04fcf1dde101a05ef69c3
---
 src/com/android/camera/PhotoModule.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6f88b6aa..9e907f66 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -312,6 +312,10 @@ public class PhotoModule
             interrupt();
         }
 
+        public boolean isCanceled() {
+            return mCancelled;
+        }
+
         @Override
         public void run() {
             try {
@@ -2118,6 +2122,10 @@ public class PhotoModule
                 screenNail.enableAspectRatioClamping();
                 mActivity.notifyScreenNailChanged();
                 screenNail.acquireSurfaceTexture();
+                CameraStartUpThread t = mCameraStartUpThread;
+                if (t != null && t.isCanceled()) {
+                    return; // Exiting, so no need to get the surface texture.
+                }
                 mSurfaceTexture = screenNail.getSurfaceTexture();
             }
             mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation);
-- 
cgit v1.2.3