Prevent call to getSurfaceTexture after startPreview() is canceled.

 Bug 7990250

Change-Id: Ic57192e88eb4418d98d04fcf1dde101a05ef69c3

1 files changed, 8 insertions, 0 deletions

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);