[hardware/rockchip/camera] camerahal: v1.0x37.0

hardware/rockchip/camera/CameraHal/Android.mk

@@ -40,11 +40,16 @@ LOCAL_C_INCLUDES += \
   $(LOCAL_PATH)/../SiliconImage/include\
   $(LOCAL_PATH)/../SiliconImage/include/isp_cam_api\
   bionic\
-  external/stlport/stlport\
   external/tinyxml2\
   system/media/camera/include\
-  system/core/libion/kernel-headers/linux\
-  system/core/libion/include/ion
+  system/core/libion/include/ion\
+  system/core/libion/kernel-headers/linux
+
+#has no "external/stlport" from Android 6.0 on                         
+ifeq (1,$(strip $(shell expr $(PLATFORM_VERSION) \< 6.0)))
+LOCAL_C_INCLUDES += \
+    external/stlport/stlport
+endif
 
 LOCAL_C_INCLUDES += \
     external/skia/include/core \
@@ -66,10 +71,15 @@ LOCAL_SHARED_LIBRARIES:= \
     libvpu\
     libdl\
 	libisp_silicomimageisp_api \
-	libstlport\
 	libexpat \
 	libskia \
 
+#has no "external/stlport" from Android 6.0 on                         
+ifeq (1,$(strip $(shell expr $(PLATFORM_VERSION) \< 6.0)))
+LOCAL_SHARED_LIBRARIES += \
+    libstlport
+endif
+
 #LOCAL_STATIC_LIBRARIES :=  libisp_calibdb libtinyxml2 libisp_cam_calibdb libisp_ebase \
 #							libisp_oslayer libisp_common libisp_hal libisp_isi\
 #							libisp_cam_engine  libisp_version libisp_cameric_reg_drv  \
@@ -198,6 +208,10 @@ ifeq (1,$(strip $(shell expr $(PLATFORM_VERSION) \>= 5.0)))
 LOCAL_CFLAGS += -DANDROID_5_X
 endif
 
+ifeq (1,$(strip $(shell expr $(PLATFORM_VERSION) \>= 6.0)))
+LOCAL_CFLAGS += -DANDROID_6_X
+endif
+
 #LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 ifneq (1,$(strip $(shell expr $(PLATFORM_VERSION) \>= 5.0)))
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw

hardware/rockchip/camera/CameraHal/CameraHal.h

@@ -27,6 +27,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <dlfcn.h>
+#include <math.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -540,6 +541,8 @@ namespace android {
 	1) fix bug in v1.0x36.7:dynamic query iommu status for usb camera.
 	2) macro IOMMU is invalide, remove it.
 	3) avoid the access of mDisplayBufInfo when it is NULL.
+*v1.0x37.0:
+	compatible with android 6.0
 */
 
 #define CONFIG_CAMERAHAL_VERSION KERNEL_VERSION(1, 0x36, 0xd)

hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp

@@ -68,6 +68,10 @@ camera_module_t HAL_MODULE_INFO_SYM = {
     get_vendor_tag_ops:NULL,
 #if defined(ANDROID_5_X)
     open_legacy:NULL,
+#endif
+#if defined(ANDROID_6_X)
+    set_torch_mode:NULL,
+    init:NULL,
 #endif
     reserved: {0}   
 };

hardware/rockchip/camera/CameraHal/SensorListener.cpp

@@ -132,7 +132,12 @@ SensorListener::~SensorListener() {
 
 status_t SensorListener::initialize() {
     status_t ret = NO_ERROR;
+
+#if defined(ANDROID_6_X)
+    SensorManager mgr(String16("CamHal Sensor"));
+#else
     SensorManager& mgr(SensorManager::getInstance());
+#endif
 
     LOG_FUNCTION_NAME;
 
@@ -192,7 +197,12 @@ void SensorListener::handleOrientation(uint32_t orientation, uint32_t tilt) {
 
 void SensorListener::enableSensor(sensor_type_t type) {
     Sensor const* sensor;
+
+#if defined(ANDROID_6_X)
+    SensorManager mgr(String16("CamHal Sensor"));
+#else
     SensorManager& mgr(SensorManager::getInstance());
+#endif
 
     LOG_FUNCTION_NAME;
 
@@ -211,7 +221,12 @@ void SensorListener::enableSensor(sensor_type_t type) {
 
 void SensorListener::disableSensor(sensor_type_t type) {
     Sensor const* sensor;
+
+#if defined(ANDROID_6_X)
+    SensorManager mgr(String16("CamHal Sensor"));
+#else
     SensorManager& mgr(SensorManager::getInstance());
+#endif
 
     LOG_FUNCTION_NAME;