From 9ef9925131835743f5316393758c14532c06277d Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Thu, 18 Jul 2013 18:04:19 -0700 Subject: Refactor CameraManager. 1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465 --- src/com/android/camera/CameraHolder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/com/android/camera/CameraHolder.java') diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index 5b7bbfda3..d913df709 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -207,7 +207,8 @@ public class CameraHolder { try { Log.v(TAG, "open camera " + cameraId); if (mMockCameraInfo == null) { - mCameraDevice = CameraManager.instance().cameraOpen(cameraId); + mCameraDevice = CameraManagerFactory + .getAndroidCameraManager().cameraOpen(cameraId); } else { if (mMockCamera == null) throw new RuntimeException(); -- cgit v1.2.3