vasishath · DrRamm · Dec 8, 2016 · Jan 17, 2017 · Oct 30, 2014 · Feb 7, 2017
diff --git a/QCamera/HAL/core/Android.mk b/QCamera/HAL/core/Android.mk
@@ -105,9 +105,9 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
-        hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw
+LOCAL_C_INCLUDES += hardware/qcom/display/msm8994/libgralloc \
+        hardware/qcom/display/msm8994/libgenlock \
+        hardware/qcom/media/msm8974/libstagefrighthw
 
 # if debug service layer and up , use stub camera!
 LOCAL_C_INCLUDES += \

diff --git a/QCamera/HAL/core/src/QCameraHAL.cpp b/QCamera/HAL/core/src/QCameraHAL.cpp
@@ -20,7 +20,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraHAL"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL/core/src/QCameraHWI_Mem.cpp b/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
@@ -20,7 +20,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraHWI_Mem"
 #include <utils/Log.h>
 

diff --git a/QCamera/HAL/core/src/QCameraHWI_Parm.cpp b/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
@@ -18,7 +18,7 @@
 */
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraHWI_Parm"
 #include <utils/Log.h>
 

diff --git a/QCamera/HAL/core/src/QCameraHWI_Record.cpp b/QCamera/HAL/core/src/QCameraHWI_Record.cpp
@@ -20,7 +20,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraHWI_Record"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL/core/src/QCameraHWI_Still.cpp b/QCamera/HAL/core/src/QCameraHWI_Still.cpp
@@ -19,9 +19,9 @@
 
 /*#error uncomment this for compiler test!*/
 
-#define LOG_NDEBUG 0
-#define LOG_NDDEBUG 0
-#define LOG_NIDEBUG 0
+#define LOG_NDEBUG 1
+#define LOG_NDDEBUG 1
+#define LOG_NIDEBUG 1
 #define LOG_TAG "QCameraHWI_Still"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL/core/src/QCameraStream.cpp b/QCamera/HAL/core/src/QCameraStream.cpp
@@ -19,8 +19,8 @@
 
 /*#error uncomment this for compiler test!*/
 
-#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NDEBUG 1
+#define ALOG_NIDEBUG 1
 #define LOG_TAG __FILE__
 #include <utils/Log.h>
 

diff --git a/QCamera/HAL/usbcamcore/src/QCameraMjpegDecode.cpp b/QCamera/HAL/usbcamcore/src/QCameraMjpegDecode.cpp
@@ -27,7 +27,7 @@
  */
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraMjpegDecode"
 #include <utils/Log.h>
 

diff --git a/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp b/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp
@@ -27,7 +27,7 @@
  */
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraUsbParm"
 #include <utils/Log.h>
 

diff --git a/QCamera/HAL/usbcamcore/src/QualcommUsbCamera.cpp b/QCamera/HAL/usbcamcore/src/QualcommUsbCamera.cpp
@@ -27,7 +27,7 @@
  */
  /*#error uncomment this for compiler test!*/
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QualcommUsbCamera"
 
 #include <utils/Log.h>

diff --git a/QCamera/HAL/wrapper/QualcommCamera.cpp b/QCamera/HAL/wrapper/QualcommCamera.cpp
@@ -29,7 +29,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QualcommCamera"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL2/core/Android.mk b/QCamera/HAL2/core/Android.mk
@@ -53,9 +53,9 @@ LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../../stack/mm-jpeg-interface/inc\
         $(TARGET_OUT_INTERMEDIATES)/include/mm-camera-interface_badger \
 
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc \
-        hardware/qcom/display/libgenlock \
-        hardware/qcom/media/libstagefrighthw \
+LOCAL_C_INCLUDES += hardware/qcom/display/msm8994/libgralloc \
+        hardware/qcom/display/msm8994/libgenlock \
+        hardware/qcom/media/msm8974/libstagefrighthw \
 	system/media/camera/include
 
 # if debug service layer and up , use stub camera!

diff --git a/QCamera/HAL2/core/src/QCameraHAL.cpp b/QCamera/HAL2/core/src/QCameraHAL.cpp
@@ -17,7 +17,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QCameraHAL"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL2/core/src/QCameraHWI.cpp b/QCamera/HAL2/core/src/QCameraHWI.cpp
@@ -16,7 +16,7 @@
 
 /*#error uncomment this for compiler test!*/
 
-#define LOG_NIDEBUG 0
+#define LOG_NIDEBUG 1
 //#define LOG_NDEBUG 0
 
 #define LOG_TAG "QCameraHWI"

diff --git a/QCamera/HAL2/core/src/QCameraStream.cpp b/QCamera/HAL2/core/src/QCameraStream.cpp
@@ -16,8 +16,8 @@
 
 /*#error uncomment this for compiler test!*/
 
-#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NDEBUG 1
+#define ALOG_NIDEBUG 1
 #define LOG_TAG __FILE__
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/HAL2/wrapper/QualcommCamera.cpp b/QCamera/HAL2/wrapper/QualcommCamera.cpp
@@ -29,7 +29,7 @@
 /*#error uncomment this for compiler test!*/
 
 //#define ALOG_NDEBUG 0
-#define ALOG_NIDEBUG 0
+#define ALOG_NIDEBUG 1
 #define LOG_TAG "QualcommCamera"
 #include <utils/Log.h>
 #include <utils/threads.h>

diff --git a/QCamera/stack/mm-camera-interface/Android.mk b/QCamera/stack/mm-camera-interface/Android.mk
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES += \
     $(TARGET_OUT_HEADERS)/mm-still/mm-omx
 # (END) Need to remove later once dependency on jpeg removed
 
-LOCAL_C_INCLUDES+= hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES+= hardware/qcom/media/msm8974/mm-core/inc
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
 LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
 

diff --git a/QCamera2/HAL/Android.mk b/QCamera2/HAL/Android.mk
@@ -18,6 +18,11 @@ LOCAL_SRC_FILES := \
         wrapper/QualcommCamera.cpp
 
 LOCAL_CFLAGS = -Wall
+LOCAL_CLANG_CFLAGS += \
+    -Wno-error=unused-variable \
+    -Wno-error=sign-compare \
+    -Wno-error=unused-parameter \
+    -Wno-error=unused-private-field 
 
 LOCAL_CFLAGS += -DHAS_MULTIMEDIA_HINTS -DDEFAULT_ZSL_MODE_ON -DDEFAULT_DENOISE_MODE_ON -DCANCRO_CAMERA_HAL
 
@@ -42,9 +47,10 @@ endif
 
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../stack/common \
+        framework/native/include \
         frameworks/native/include/media/openmax \
-        hardware/qcom/display/libgralloc \
-        hardware/qcom/media/libstagefrighthw \
+        hardware/qcom/display/msm8994/libgralloc \
+        hardware/qcom/media/msm8974/libstagefrighthw \
         $(LOCAL_PATH)/../../mm-image-codec/qexif \
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
         $(LOCAL_PATH)/../util \
@@ -56,20 +62,19 @@ else
 LOCAL_CFLAGS += -DUSE_KK_CODE
 endif
 
-ifeq ($(TARGET_USE_VENDOR_CAMERA_EXT),true)
-LOCAL_C_INCLUDES += hardware/qcom/display/msm8974/libgralloc
-else
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
-endif
+LOCAL_C_INCLUDES += hardware/qcom/display/msm8994/libgralloc
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
-LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libgui
+LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libhidltransport libsensor [email protected]
+LOCAL_STATIC_LIBRARIES := libarect
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
+LOCAL_CLANG := false
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/QCamera2/HAL/QCamera2Factory.cpp b/QCamera2/HAL/QCamera2Factory.cpp
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <utils/Errors.h>
 #include <hardware/camera.h>
+#include <sensor/SensorManager.h>
 
 #include "QCamera2Factory.h"
 
@@ -140,6 +141,14 @@ int QCamera2Factory::getCameraInfo(int camera_id, struct camera_info *info)
     return rc;
 }
 
+bool QCamera2Factory::can_talk_to_sensormanager()
+{
+    android::SensorManager& sensorManager(
+            android::SensorManager::getInstanceForPackage(android::String16("camera")));
+    android::Sensor const * const * sensorList;
+    return sensorManager.getSensorList(&sensorList) >= 0;
+}
+
 /*===========================================================================
  * FUNCTION   : cameraDeviceOpen
  *
@@ -157,9 +166,21 @@ int QCamera2Factory::cameraDeviceOpen(int camera_id,
                     struct hw_device_t **hw_device)
 {
     int rc = NO_ERROR;
+
+    android::Mutex::Autolock lock(gCameraWrapperLock);
+
     if (camera_id < 0 || camera_id >= mNumOfCameras)
         return BAD_VALUE;
 
+    // mm-qcamera-daemon blocks until initialization of sensorservice
+    // and might miss V4L events generated by the HAL during that time,
+    // causing HAL initialization failures. Avoid those failures by waiting
+    // for sensorservice initialization before opening the HAL.
+    if (!can_talk_to_sensormanager()) {
+        ALOGE("Waiting for sensor service failed.");
+        return android::NO_INIT;
+    }
+
     QCamera2HardwareInterface *hw = new QCamera2HardwareInterface((uint32_t)camera_id);
     if (!hw) {
         ALOGE("Allocation of hardware interface failed");
@@ -202,7 +223,7 @@ int QCamera2Factory::camera_device_open(
 }
 
 struct hw_module_methods_t QCamera2Factory::mModuleMethods = {
-    open: QCamera2Factory::camera_device_open,
+    .open = QCamera2Factory::camera_device_open,
 };
 
 }; // namespace qcamera
diff --git a/QCamera2/HAL/QCamera2Factory.h b/QCamera2/HAL/QCamera2Factory.h
@@ -53,12 +53,14 @@ class QCamera2Factory
     int cameraDeviceOpen(int camera_id, struct hw_device_t **hw_device);
     static int camera_device_open(const struct hw_module_t *module, const char *id,
                 struct hw_device_t **hw_device);
+    bool can_talk_to_sensormanager();
 
 public:
     static struct hw_module_methods_t mModuleMethods;
 
 private:
     int mNumOfCameras;
+    android::Mutex gCameraWrapperLock;
 };
 
 }; /*namespace qcamera*/