diff options
| author | Sanjeev Garg <sangarg@codeaurora.org> | 2015-10-12 11:58:01 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-03 15:44:40 -0700 |
| commit | a2794eab22238885f5a3e2ed95e9fd2a1c42e810 (patch) | |
| tree | e6a6c6cb3a997fecb7f3709186c5108169f97c3d /src/com/android/camera/CameraActivity.java | |
| parent | 7383a2dc7fa69383bfca0a1693e5bbe3c9601d51 (diff) | |
| download | android_packages_apps_Snap-a2794eab22238885f5a3e2ed95e9fd2a1c42e810.tar.gz android_packages_apps_Snap-a2794eab22238885f5a3e2ed95e9fd2a1c42e810.tar.bz2 android_packages_apps_Snap-a2794eab22238885f5a3e2ed95e9fd2a1c42e810.zip | |
SnapdragonCamera: Handle startPreview exception in camera.
If any exception occurs in start preview then camera app
should handle this exception and should display error pop-up
and exit gracefully.
CRs-Fixed: 919778
Change-Id: I80b60224d5d47a96dad78c40f8a23e3e9be45e65
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b2705e2b2..186fa514a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -320,6 +320,15 @@ public class CameraActivity extends Activity CameraUtil.showErrorAndFinish(CameraActivity.this, R.string.cannot_connect_camera); } + + @Override + public void onStartPreviewFailure(int cameraId) { + UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, + UsageStatistics.ACTION_START_PREVIEW_FAIL, "startpreview"); + + CameraUtil.showErrorAndFinish(CameraActivity.this, + R.string.cannot_connect_camera); + } }; // update the status of storage space when SD card status changed. |