diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-30 12:56:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-30 12:56:47 -0700 |
| commit | 6c20d314ec43be447e9a2bfb17e96452d996a18b (patch) | |
| tree | f1bd010cf7bbae11030bfe2edecafcfdc7109272 | |
| parent | 3115360958dcd736e520e64e70fdf5120da2054b (diff) | |
| parent | 612ebddbc642338fce76919767a691875ba3c5f8 (diff) | |
| download | android_packages_apps_Snap-6c20d314ec43be447e9a2bfb17e96452d996a18b.tar.gz android_packages_apps_Snap-6c20d314ec43be447e9a2bfb17e96452d996a18b.tar.bz2 android_packages_apps_Snap-6c20d314ec43be447e9a2bfb17e96452d996a18b.zip | |
Merge "SnapdragonCamera: Add camera error callback to WideAngle Panorama"
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 61a416f37..5c45cae35 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -96,6 +96,7 @@ public class WideAnglePanoramaModule private MosaicPreviewRenderer mMosaicPreviewRenderer; private Object mRendererLock = new Object(); private Object mWaitObject = new Object(); + private final CameraErrorCallback mErrorCallback = new CameraErrorCallback(); private String mPreparePreviewString; private String mDialogTitle; @@ -339,6 +340,7 @@ public class WideAnglePanoramaModule private void releaseCamera() { if (mCameraDevice != null) { CameraHolder.instance().release(); + mCameraDevice.setErrorCallback(null); mCameraDevice = null; mCameraState = PREVIEW_STOPPED; } @@ -1004,6 +1006,8 @@ public class WideAnglePanoramaModule return; } + mCameraDevice.setErrorCallback(mErrorCallback); + // This works around a driver issue. startPreview may fail if // stopPreview/setPreviewTexture/startPreview are called several times // in a row. mCameraTexture can be null after pressing home during |