diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-06 08:48:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-06 08:48:47 -0700 |
| commit | 5179bc00d2b8d29ed008564f77b112f04afea973 (patch) | |
| tree | 5a118e2a4db2fe9edecf6b45d39cd1bb553f877d | |
| parent | a7444215df8b707c4ccd505805d9e85b59266596 (diff) | |
| parent | 38a07d828463fa1a76c578e69f43345611ccba5d (diff) | |
| download | android_packages_apps_Snap-5179bc00d2b8d29ed008564f77b112f04afea973.tar.gz android_packages_apps_Snap-5179bc00d2b8d29ed008564f77b112f04afea973.tar.bz2 android_packages_apps_Snap-5179bc00d2b8d29ed008564f77b112f04afea973.zip | |
Merge "SnapdragonCamera: Fix app freeze when connect to camera failed"
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 1 |
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; } |