Move virtual_camera_service_discovery flag to virtual_devices namespace
... and config owned by Virtual Device Manager team.
Bug: 311459626
Test: atest CameraProviderManagerTest
Change-Id: Ie037578f1da39d8409a95b12064d4d0aea313856
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 54dc2bc..adcb523 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -32,6 +32,7 @@
#include <dlfcn.h>
#include <future>
#include <inttypes.h>
+#include <android_companion_virtualdevice_flags.h>
#include <android/binder_manager.h>
#include <android/hidl/manager/1.2/IServiceManager.h>
#include <hidl/ServiceManagement.h>
@@ -59,6 +60,7 @@
using hardware::camera2::utils::CameraIdAndSessionConfiguration;
namespace flags = com::android::internal::camera::flags;
+namespace vd_flags = android::companion::virtualdevice::flags;
namespace {
const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
@@ -3162,7 +3164,7 @@
}
bool CameraProviderManager::isVirtualCameraHalEnabled() {
- return flags::virtual_camera_service_discovery();
+ return vd_flags::virtual_camera_service_discovery();
}
} // namespace android