summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-08-06 13:51:53 +0800
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:44:39 -0700
commit1ff17d7e28e09b5e352199d6736bca32af36b330 (patch)
tree252aa4d06ec462885898820d9e6d5d0692155b4e
parent902626f68e472c91025adeb7e09868cb76771870 (diff)
downloadandroid_packages_apps_Snap-1ff17d7e28e09b5e352199d6736bca32af36b330.zip
android_packages_apps_Snap-1ff17d7e28e09b5e352199d6736bca32af36b330.tar.gz
android_packages_apps_Snap-1ff17d7e28e09b5e352199d6736bca32af36b330.tar.bz2
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
-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 7b92397..7d378ce 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;
}