diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2020-09-08 16:25:17 -0700 |
|---|---|---|
| committer | Fei Wang <wangzfei@google.com> | 2020-10-13 19:04:12 +0000 |
| commit | ab0d91f104852e80ae582d172acd86d5a486de7f (patch) | |
| tree | 365b8a31857959ee52822e642cdde5a1f2086754 /camera/CameraBase.cpp | |
| parent | 5e710feacb9b8d8f7db1f4e15d2e9d2aac83da0e (diff) | |
libcamera_client: Add utils function isCameraServiceDisabled.
Note: ndk_vendor/ACameraManager.cpp is vendor code whcih can't depend on
a framework library without it being vndk, which libcamera_client isn't.
Bug: 168061412
Test: builds
Test: Camera app, native cts imagereader test(validity)
Change-Id: I87d8e056d0e8ef938d5c8f976417ca707d6471d9
Merged-In: I87d8e056d0e8ef938d5c8f976417ca707d6471d9
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit f5b9cc68a46184bd18ecf7c4d9d150460acd19e1)
Diffstat (limited to 'camera/CameraBase.cpp')
| -rw-r--r-- | camera/CameraBase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index aecb70abad..0b0f5846cf 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -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; } |