Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 150bf578 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Limit QC camera features to post-ICS HALs 

ICS blobs don't support longshot, and have a different API/method enum
for histograms

Change-Id: I6704b9302344ae2ae6386312b68de669bb5c11f2
parent 12ded6ce

core/jni/android_hardware_Camera.cpp

+3 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ void JNICameraContext::setCallbackMode(JNIEnv *env, bool installed, bool manualM 
static void android_hardware_Camera_setLongshot(JNIEnv *env, jobject thiz, jboolean enable)

{

    ALOGV("setLongshot");

#ifdef QCOM_HARDWARE

#if defined(QCOM_HARDWARE) && !defined(ICS_CAMERA_BLOB)

    JNICameraContext* context;

    status_t rc;

    sp<Camera> camera = get_native_camera(env, thiz, &context);
@@ -409,7 +409,7 @@ static void android_hardware_Camera_setLongshot(JNIEnv *env, jobject thiz, jbool 
static void android_hardware_Camera_sendHistogramData(JNIEnv *env, jobject thiz)

 {

   ALOGV("sendHistogramData" );

#ifdef QCOM_HARDWARE

#if defined(QCOM_HARDWARE) && !defined(ICS_CAMERA_BLOB)

   JNICameraContext* context;

   status_t rc;

   sp<Camera> camera = get_native_camera(env, thiz, &context);
@@ -425,7 +425,7 @@ static void android_hardware_Camera_sendHistogramData(JNIEnv *env, jobject thiz) 
 static void android_hardware_Camera_setHistogramMode(JNIEnv *env, jobject thiz, jboolean mode)

 {

   ALOGV("setHistogramMode: mode:%d", (int)mode);

#ifdef QCOM_HARDWARE

#if defined(QCOM_HARDWARE) && !defined(ICS_CAMERA_BLOB)

   JNICameraContext* context;

   status_t rc;

   sp<Camera> camera = get_native_camera(env, thiz, &context);