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

Commit c3ffbec5 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "libcamera_client: Add utils function isCameraServiceDisabled."

parents 2bf7f299 f5b9cc68

camera/CameraBase.cpp

+2 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <binder/IMemory.h>



#include <camera/CameraBase.h>

#include <camera/CameraUtils.h>



// needed to instantiate

#include <camera/Camera.h>
@@ -124,9 +125,7 @@ const sp<::android::hardware::ICameraService> CameraBase<TCam, TCamTraits>::getC 
{

    Mutex::Autolock _l(gLock);

    if (gCameraService.get() == 0) {

        char value[PROPERTY_VALUE_MAX];

        property_get("config.disable_cameraservice", value, "0");

        if (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0) {

        if (CameraUtils::isCameraServiceDisabled()) {

            return gCameraService;

        }

camera/CameraUtils.cpp

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <system/window.h>

#include <system/graphics.h>



#include <cutils/properties.h>

#include <utils/Log.h>



namespace android {
@@ -122,4 +123,10 @@ status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo, 
    return OK;

}



bool CameraUtils::isCameraServiceDisabled() {

    char value[PROPERTY_VALUE_MAX];

    property_get("config.disable_cameraservice", value, "0");

    return (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0);

}



} /* namespace android */

camera/include/camera/CameraUtils.h

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ class CameraUtils { 
         */

        static bool isNativeHandleMetadata(const sp<IMemory>& imageData);



        /**

         * Check if camera service is disabled on this device

         */

        static bool isCameraServiceDisabled();



    private:

        CameraUtils();

};

camera/ndk/impl/ACameraManager.cpp

+2 −7
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <utils/Vector.h>

#include <cutils/properties.h>

#include <stdlib.h>

#include <camera/CameraUtils.h>

#include <camera/VendorTagDescriptor.h>



using namespace android::acam;
@@ -70,12 +71,6 @@ CameraManagerGlobal::~CameraManagerGlobal() { 
    mCameraService.clear();

}



static bool isCameraServiceDisabled() {

    char value[PROPERTY_VALUE_MAX];

    property_get("config.disable_cameraservice", value, "0");

    return (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0);

}



sp<hardware::ICameraService> CameraManagerGlobal::getCameraService() {

    Mutex::Autolock _l(mLock);

    return getCameraServiceLocked();
@@ -83,7 +78,7 @@ sp<hardware::ICameraService> CameraManagerGlobal::getCameraService() { 


sp<hardware::ICameraService> CameraManagerGlobal::getCameraServiceLocked() {

    if (mCameraService.get() == nullptr) {

        if (isCameraServiceDisabled()) {

        if (CameraUtils::isCameraServiceDisabled()) {

            return mCameraService;

        }