From 1ff17d7e28e09b5e352199d6736bca32af36b330 Mon Sep 17 00:00:00 2001
From: likaid <likaid@codeaurora.org>
Date: Thu, 6 Aug 2015 13:51:53 +0800
Subject: SnapdragonCamera: Fix app freeze when connect to camera failed

In Panorama mode, the app wasn't closed directly when connected to
camera failed, that may cause more serious issue.

Finish the activity immediately when open camera failed.

Change-Id: I057611a3baf37ef915b3c182e5c3b5f12413c134
CRs-Fixed: 882041
---
 src/com/android/camera/WideAnglePanoramaModule.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 7b923976b..7d378ce15 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -976,6 +976,7 @@ public class WideAnglePanoramaModule
         mCaptureState = CAPTURE_STATE_VIEWFINDER;
 
         if (!setupCamera()) {
+            CameraUtil.showErrorAndFinish(mActivity, R.string.cannot_connect_camera);
             Log.e(TAG, "Failed to open camera, aborting");
             return;
         }
-- 
cgit v1.2.3