summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-08-06 13:51:53 +0800
committerlikaid <likaid@codeaurora.org>2015-08-06 13:51:53 +0800
commit38a07d828463fa1a76c578e69f43345611ccba5d (patch)
treebe2c3a42b0371c1d0bf3731545609e3eb3826600 /src/com/android/camera/WideAnglePanoramaModule.java
parent71c704a10909735e1323e767f04ab8be8dcca983 (diff)
downloadandroid_packages_apps_Snap-38a07d828463fa1a76c578e69f43345611ccba5d.tar.gz
android_packages_apps_Snap-38a07d828463fa1a76c578e69f43345611ccba5d.tar.bz2
android_packages_apps_Snap-38a07d828463fa1a76c578e69f43345611ccba5d.zip
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
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaModule.java')
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index eb02bb50f..0f7596af3 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -627,6 +627,7 @@ public class WideAnglePanoramaModule implements
mCaptureState = CAPTURE_STATE_VIEWFINDER;
if (!setupCamera()) {
+ CameraUtil.showErrorAndFinish(mActivity, R.string.cannot_connect_camera);
Log.e(TAG, "Failed to open camera, aborting");
return;
}