commit 98e24724fb77445d4d015a5fec4ecbd5b49abc9b
author Igor Murashkin <iam@google.com> Wed Jun 19 19:51:04 2013 -0700
committer Igor Murashkin <iam@google.com> Thu Jun 20 20:31:36 2013 -0700
tree 0cb728e66991da37489bac60fd1ac9870c4d095d
parent e7ee7637747371635a85fedd24d2190bb1f38651

Make android.hardware.photography.Camera work on HAL3+ devices

Bug: 9213377
Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5

services/camera/libcameraservice/Camera2ClientBase.cpp

diff --git a/services/camera/libcameraservice/Camera2ClientBase.cpp b/services/camera/libcameraservice/Camera2ClientBase.cpp
index 5e4832c..561dcfc 100644
--- a/services/camera/libcameraservice/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/Camera2ClientBase.cpp
@@ -30,7 +30,8 @@
 
 #include "photography/CameraDeviceClient.h"
 
-#include "Camera2Device.h"
+#include "CameraDeviceBase.h"
+#include "CameraDeviceFactory.h"
 
 namespace android {
 using namespace camera2;
@@ -56,7 +57,9 @@
         mSharedCameraCallbacks(remoteCallback)
 {
     ALOGI("Camera %d: Opened", cameraId);
-    mDevice = new Camera2Device(cameraId);
+
+    mDevice = CameraDeviceFactory::createDevice(cameraId);
+    LOG_ALWAYS_FATAL_IF(mDevice == 0, "Device should never be NULL here.");
 }
 
 template <typename TClientBase>