commit ab0d91f104852e80ae582d172acd86d5a486de7f
author Jayant Chowdhary <jchowdhary@google.com> Tue Sep 08 16:25:17 2020 -0700
committer Fei Wang <wangzfei@google.com> Tue Oct 13 19:04:12 2020 +0000
tree 365b8a31857959ee52822e642cdde5a1f2086754
parent 5e710feacb9b8d8f7db1f4e15d2e9d2aac83da0e

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)

camera/CameraBase.cpp

diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp
index aecb70a..0b0f584 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 @@
 {
     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;
         }