diff options
| author | Camera Software Integration <camswint@localhost> | 2016-07-19 22:49:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-19 22:49:27 -0700 |
| commit | 69c4a33b7cb825b5cae85b85fa1828870ce88454 (patch) | |
| tree | d625e7fcd5125a83df607e139f69a795efc05cc4 /src/com/android/camera/CaptureModule.java | |
| parent | ad58eaab8160d55b193261d99b93d2b33464c7d8 (diff) | |
| parent | 0cb58a0566b3168a397782432e595ea0580b0391 (diff) | |
| download | android_packages_apps_Snap-69c4a33b7cb825b5cae85b85fa1828870ce88454.tar.gz android_packages_apps_Snap-69c4a33b7cb825b5cae85b85fa1828870ce88454.tar.bz2 android_packages_apps_Snap-69c4a33b7cb825b5cae85b85fa1828870ce88454.zip | |
Merge "SnapdragonCamera: Replacing mono surface" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index cc9de40c2..5f7395f71 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -708,7 +708,7 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onConfigureFailed(CameraCaptureSession cameraCaptureSession) { - Log.e(TAG, "cameracapturesession - onConfigureFailed"); + Log.e(TAG, "cameracapturesession - onConfigureFailed "+id); new AlertDialog.Builder(mActivity) .setTitle("Camera Initialization Failed") .setMessage("Closing SnapdragonCamera") @@ -2725,9 +2725,9 @@ public class CaptureModule implements CameraModule, PhotoController, private void addPreviewSurface(CaptureRequest.Builder builder, List<Surface> surfaceList, int id) { if (isBackCamera() && getCameraMode() == DUAL_MODE && id == MONO_ID) { if(surfaceList != null) { - surfaceList.add(mUI.getSurfaceHolder2().getSurface()); + surfaceList.add(mUI.getMonoDummySurface()); } - builder.addTarget(mUI.getSurfaceHolder2().getSurface()); + builder.addTarget(mUI.getMonoDummySurface()); return; } else { List<Surface> surfaces = mFrameProcessor.getInputSurfaces(); @@ -2744,7 +2744,7 @@ public class CaptureModule implements CameraModule, PhotoController, private Surface getPreviewSurfaceForSession(int id) { if (isBackCamera()) { if (getCameraMode() == DUAL_MODE && id == MONO_ID) { - return mUI.getSurfaceHolder2().getSurface(); + return mUI.getMonoDummySurface(); } else { return mUI.getSurfaceHolder().getSurface(); } |