commit 353d2e39948802eac48f2fe4329d9afd3e59a395
author Bob Badour <bbadour@google.com> Mon Mar 01 07:19:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 01 07:19:19 2021 +0000
tree 00ec52f1383bbc5b462b68ebb0a875d905ba86a8
parent 5aee9d4fc1833c8329cfbced27c416c9528d62c8
parent 59b2dcccdb0ab7292dd6e440fb4a9deb74ad1c75

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av"

camera/Android.bp

diff --git a/camera/Android.bp b/camera/Android.bp
index f4e844a..93bc68d 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -81,6 +81,7 @@
     ],
 
     shared_libs: [
+        "libbase",
         "libcutils",
         "libutils",
         "liblog",

camera/CameraUtils.cpp

diff --git a/camera/CameraUtils.cpp b/camera/CameraUtils.cpp
index f9b1b37..af3c492 100644
--- a/camera/CameraUtils.cpp
+++ b/camera/CameraUtils.cpp
@@ -20,14 +20,16 @@
 #include <camera/CameraUtils.h>
 #include <media/hardware/HardwareAPI.h>
 
+#include <android-base/properties.h>
 #include <system/window.h>
 #include <system/graphics.h>
 
-#include <cutils/properties.h>
 #include <utils/Log.h>
 
 namespace android {
 
+const char *kCameraServiceDisabledProperty = "config.disable_cameraservice";
+
 status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo,
                 /*out*/int32_t* transform) {
     ALOGV("%s", __FUNCTION__);
@@ -124,9 +126,7 @@
 }
 
 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);
+    return base::GetBoolProperty(kCameraServiceDisabledProperty, false);
 }
 
 } /* namespace android */