aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2013-12-17 17:59:45 -0800
committerEthan Chen <intervigil@gmail.com>2014-01-23 17:29:41 -0800
commit1cb22c8c36f42e3ee190eb3c3d2d970298aa8a45 (patch)
treef47ccc76ca2d4e2e0b402c6f0d96b57eb077d172
parentd5330e5fbd1e89f390cfbff5f6b0229fcdb7df0e (diff)
n1: use get_module_by_class
-rw-r--r--BoardConfig.mk2
-rw-r--r--camera/CameraWrapper.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 70dab93..f1b35f6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,7 +24,7 @@ TARGET_KERNEL_CONFIG := cyanogenmod_n1_defconfig
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/oppo/n1/bluetooth
# Camera
-COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK -DNEEDS_VECTORIMPL_SYMBOLS
+COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS
BOARD_FIX_FACE_DETECTION_SCORE := true
# Tuning
diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp
index ec35718..66ea602 100644
--- a/camera/CameraWrapper.cpp
+++ b/camera/CameraWrapper.cpp
@@ -83,7 +83,8 @@ static int check_vendor_module()
if (gVendorModule)
return 0;
- rv = hw_get_module("vendor-camera", (const hw_module_t**)&gVendorModule);
+ rv = hw_get_module_by_class("camera", "vendor",
+ (const hw_module_t**)&gVendorModule);
if (rv)
ALOGE("failed to open vendor camera module");
return rv;