Clean up virtual camera flags from the camera framework
Launched in Android 15
#codehealth
Bug: 379646558
Test: presubmit
Flag: EXEMPT cleanup
Change-Id: Ia5799287c139a2a707b70eae2d7e148a0ccea5d5
diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp
index fc1e547..a65508c 100644
--- a/camera/ndk/Android.bp
+++ b/camera/ndk/Android.bp
@@ -78,7 +78,6 @@
],
shared_libs: [
"android.companion.virtual.virtualdevice_aidl-cpp",
- "android.companion.virtualdevice.flags-aconfig-cc",
"android.hardware.common-V2-cpp",
"android.hardware.common.fmq-V1-cpp",
"camera_platform_flags_c_lib",
diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index acd7917..c7d97be 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -18,7 +18,6 @@
#define LOG_TAG "ACameraManager"
#include "ACameraManager.h"
-#include <android_companion_virtualdevice_flags.h>
#include <camera/CameraUtils.h>
#include <camera/StringUtils.h>
#include <camera/VendorTagDescriptor.h>
@@ -31,7 +30,6 @@
#include <com_android_internal_camera_flags.h>
using namespace android::acam;
-namespace vd_flags = android::companion::virtualdevice::flags;
namespace flags = com::android::internal::camera::flags;
namespace android {
@@ -62,10 +60,6 @@
// Returns device id calling process is running on.
// If the process cannot be attributed to single virtual device id, returns default device id.
int getCurrentDeviceId() {
- if (!vd_flags::camera_device_awareness()) {
- return kDefaultDeviceId;
- }
-
auto vdm = getVirtualDeviceManager();
if (vdm == nullptr) {
return kDefaultDeviceId;
@@ -91,7 +85,7 @@
// Returns device policy for POLICY_TYPE_CAMERA corresponding to deviceId.
DevicePolicy getDevicePolicyForDeviceId(const int deviceId) {
- if (!vd_flags::camera_device_awareness() || deviceId == kDefaultDeviceId) {
+ if (deviceId == kDefaultDeviceId) {
return DevicePolicy::DEVICE_POLICY_DEFAULT;
}
@@ -113,8 +107,7 @@
// Returns true if camera owned by device cameraDeviceId can be accessed within deviceContext.
bool isCameraAccessible(const DeviceContext deviceContext, const int cameraDeviceId) {
- if (!vd_flags::camera_device_awareness() ||
- deviceContext.policy == DevicePolicy::DEVICE_POLICY_DEFAULT) {
+ if (deviceContext.policy == DevicePolicy::DEVICE_POLICY_DEFAULT) {
return cameraDeviceId == kDefaultDeviceId;
}
return deviceContext.deviceId == cameraDeviceId;
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 97c6628..0606d74 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -78,7 +78,6 @@
"libxml2",
"libyuv",
"android.companion.virtual.virtualdevice_aidl-cpp",
- "android.companion.virtualdevice.flags-aconfig-cc",
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index d13e5db..f9ab6eb 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -38,7 +38,6 @@
#include <aidl/AidlCameraService.h>
#include <android-base/macros.h>
#include <android-base/parseint.h>
-#include <android_companion_virtualdevice_flags.h>
#include <android/companion/virtualnative/IVirtualDeviceManagerNative.h>
#include <binder/ActivityManager.h>
#include <binder/AppOpsManager.h>
@@ -139,7 +138,6 @@
using hardware::camera2::utils::ConcurrentCameraIdCombination;
namespace flags = com::android::internal::camera::flags;
-namespace vd_flags = android::companion::virtualdevice::flags;
// ----------------------------------------------------------------------------
// Logging support -- this is for debugging only
@@ -374,23 +372,21 @@
const std::vector<std::string> &normalDeviceIds) {
mNormalDeviceIdsWithoutSystemCamera.clear();
for (auto &cameraId : normalDeviceIds) {
- if (vd_flags::camera_device_awareness()) {
- CameraMetadata cameraInfo;
- status_t res = mCameraProviderManager->getCameraCharacteristics(
- cameraId, false, &cameraInfo,
- hardware::ICameraService::ROTATION_OVERRIDE_NONE);
- int32_t deviceId = kDefaultDeviceId;
- if (res != OK) {
- ALOGW("%s: Not able to get camera characteristics for camera id %s",
- __FUNCTION__, cameraId.c_str());
- } else {
- deviceId = getDeviceId(cameraInfo);
- }
- // Cameras associated with non-default device id's (i.e., virtual cameras) can never be
- // system cameras, so skip for non-default device id's.
- if (deviceId != kDefaultDeviceId) {
- continue;
- }
+ CameraMetadata cameraInfo;
+ status_t res = mCameraProviderManager->getCameraCharacteristics(
+ cameraId, false, &cameraInfo,
+ hardware::ICameraService::ROTATION_OVERRIDE_NONE);
+ int32_t deviceId = kDefaultDeviceId;
+ if (res != OK) {
+ ALOGW("%s: Not able to get camera characteristics for camera id %s",
+ __FUNCTION__, cameraId.c_str());
+ } else {
+ deviceId = getDeviceId(cameraInfo);
+ }
+ // Cameras associated with non-default device id's (i.e., virtual cameras) can never be
+ // system cameras, so skip for non-default device id's.
+ if (deviceId != kDefaultDeviceId) {
+ continue;
}
SystemCameraKind deviceKind = SystemCameraKind::PUBLIC;
@@ -809,7 +805,7 @@
const AttributionSourceState& clientAttribution, int32_t devicePolicy,
int32_t* numCameras) {
ATRACE_CALL();
- if (vd_flags::camera_device_awareness() && (clientAttribution.deviceId != kDefaultDeviceId)
+ if (clientAttribution.deviceId != kDefaultDeviceId
&& (devicePolicy != IVirtualDeviceManagerNative::DEVICE_POLICY_DEFAULT)) {
*numCameras = mVirtualDeviceCameraIdMapper.getNumberOfCameras(clientAttribution.deviceId);
return Status::ok();
@@ -1272,7 +1268,7 @@
std::string CameraService::cameraIdIntToStrLocked(int cameraIdInt,
int32_t deviceId, int32_t devicePolicy) {
- if (vd_flags::camera_device_awareness() && (deviceId != kDefaultDeviceId)
+ if (deviceId != kDefaultDeviceId
&& (devicePolicy != IVirtualDeviceManagerNative::DEVICE_POLICY_DEFAULT)) {
std::optional<std::string> cameraIdOptional =
mVirtualDeviceCameraIdMapper.getActualCameraId(cameraIdInt, deviceId);
@@ -5901,7 +5897,7 @@
return;
}
- if (vd_flags::camera_device_awareness() && status == StatusInternal::PRESENT) {
+ if (status == StatusInternal::PRESENT) {
CameraMetadata cameraInfo;
status_t res = mCameraProviderManager->getCameraCharacteristics(
cameraId, false, &cameraInfo, hardware::ICameraService::ROTATION_OVERRIDE_NONE);
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 53c9b8f..2d6602a 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -35,7 +35,6 @@
#include <dlfcn.h>
#include <future>
#include <inttypes.h>
-#include <android_companion_virtualdevice_flags.h>
#include <android_companion_virtualdevice_build_flags.h>
#include <android/binder_libbinder.h>
#include <android/binder_manager.h>
@@ -3624,8 +3623,7 @@
}
bool CameraProviderManager::isVirtualCameraHalEnabled() {
- return vd_flags::virtual_camera_service_discovery() &&
- vd_flags::virtual_camera_service_build_flag();
+ return vd_flags::virtual_camera_service_build_flag();
}
} // namespace android
diff --git a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
index 5b6f725..4779ab1 100644
--- a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
@@ -23,7 +23,6 @@
#include <cutils/properties.h>
#include <aidlcommonsupport/NativeHandle.h>
-#include <android_companion_virtualdevice_flags.h>
#include <android/binder_manager.h>
#include <android/hardware/ICameraService.h>
#include <camera_metadata_hidden.h>
@@ -43,7 +42,6 @@
namespace SessionConfigurationUtils = ::android::camera3::SessionConfigurationUtils;
namespace flags = com::android::internal::camera::flags;
-namespace vd_flags = android::companion::virtualdevice::flags;
using namespace aidl::android::hardware;
using namespace hardware::camera;
@@ -140,7 +138,7 @@
delete binderCookie;
});
- if (!vd_flags::virtual_camera_service_discovery() || interface->isRemote()) {
+ if (interface->isRemote()) {
binder_status_t link = AIBinder_linkToDeath(
interface->asBinder().get(), mDeathRecipient.get(), new AIBinderCookie{this});
if (link != STATUS_OK) {
diff --git a/services/camera/libcameraservice/tests/Android.bp b/services/camera/libcameraservice/tests/Android.bp
index 7c5b489..c528f1e 100644
--- a/services/camera/libcameraservice/tests/Android.bp
+++ b/services/camera/libcameraservice/tests/Android.bp
@@ -98,7 +98,6 @@
"libcamera_client",
"libgui",
"libui",
- "android.companion.virtualdevice.flags-aconfig-cc",
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
diff --git a/services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp b/services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp
index 56cacef..ec41459 100644
--- a/services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp
+++ b/services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp
@@ -20,7 +20,6 @@
#include "../common/CameraProviderManager.h"
#include <aidl/android/hardware/camera/device/BnCameraDevice.h>
#include <aidl/android/hardware/camera/provider/BnCameraProvider.h>
-#include <android_companion_virtualdevice_flags.h>
#include <android/binder_auto_utils.h>
#include <android/binder_ibinder.h>
#include <android/binder_interface_utils.h>
@@ -53,7 +52,6 @@
using ::testing::ElementsAre;
namespace flags = com::android::internal::camera::flags;
-namespace vd_flags = android::companion::virtualdevice::flags;
/**
* Basic test implementation of a camera ver. 3.2 device interface
@@ -881,8 +879,8 @@
ASSERT_TRUE(unavailablePhysicalIds.count("0") > 0 && unavailablePhysicalIds["0"].count("2") > 0)
<< "Unavailable physical camera Ids not set properly.";
}
-TEST_WITH_FLAGS(CameraProviderManagerTest, AidlVirtualCameraProviderDiscovered,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(vd_flags, virtual_camera_service_discovery))) {
+
+TEST(CameraProviderManagerTest, AidlVirtualCameraProviderDiscovered) {
sp<CameraProviderManager> providerManager = new CameraProviderManager();
sp<TestStatusListener> statusListener = new TestStatusListener();
TestAidlInteractionProxy aidlServiceProxy;
@@ -909,8 +907,7 @@
EXPECT_THAT(cameraIds, ElementsAre("123"));
}
-TEST_WITH_FLAGS(CameraProviderManagerTest, AidlVirtualCameraProviderDiscoveredOnInit,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(vd_flags, virtual_camera_service_discovery))) {
+TEST(CameraProviderManagerTest, AidlVirtualCameraProviderDiscoveredOnInit) {
sp<CameraProviderManager> providerManager = new CameraProviderManager();
sp<TestStatusListener> statusListener = new TestStatusListener();
TestAidlInteractionProxy aidlServiceProxy;
diff --git a/services/camera/libcameraservice/utils/VirtualDeviceCameraIdMapper.cpp b/services/camera/libcameraservice/utils/VirtualDeviceCameraIdMapper.cpp
index 22dd806..312da00 100644
--- a/services/camera/libcameraservice/utils/VirtualDeviceCameraIdMapper.cpp
+++ b/services/camera/libcameraservice/utils/VirtualDeviceCameraIdMapper.cpp
@@ -17,22 +17,14 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "VirtualDeviceCameraIdMapper"
-#include <android_companion_virtualdevice_flags.h>
#include <camera/CameraUtils.h>
#include "VirtualDeviceCameraIdMapper.h"
namespace android {
-namespace vd_flags = android::companion::virtualdevice::flags;
-
void VirtualDeviceCameraIdMapper::addCamera(const std::string& cameraId,
int32_t deviceId, const std::string& mappedCameraId) {
- if (!vd_flags::camera_device_awareness()) {
- ALOGV("%s: Device-aware camera feature is not enabled", __func__);
- return;
- }
-
if (deviceId == kDefaultDeviceId) {
ALOGV("%s: Not adding entry for a camera of the default device", __func__);
return;
@@ -47,11 +39,6 @@
}
void VirtualDeviceCameraIdMapper::removeCamera(const std::string& cameraId) {
- if (!vd_flags::camera_device_awareness()) {
- ALOGV("%s: Device-aware camera feature is not enabled", __func__);
- return;
- }
-
auto deviceIdAndMappedCameraIdPair = getDeviceIdAndMappedCameraIdPair(cameraId);
std::scoped_lock lock(mLock);
@@ -67,12 +54,6 @@
return mappedCameraId;
}
- if (!vd_flags::camera_device_awareness()) {
- ALOGV("%s: Device-aware camera feature is not enabled, returning the camera id as "
- "the mapped camera id for camera %s", __func__, mappedCameraId.c_str());
- return mappedCameraId;
- }
-
std::scoped_lock lock(mLock);
auto iterator = mDeviceIdMappedCameraIdPairToCameraIdMap.find(
{deviceId, mappedCameraId});
@@ -86,11 +67,6 @@
std::pair<int32_t, std::string> VirtualDeviceCameraIdMapper::getDeviceIdAndMappedCameraIdPair(
const std::string& cameraId) const {
- if (!vd_flags::camera_device_awareness()) {
- ALOGV("%s: Device-aware camera feature is not enabled", __func__);
- return std::make_pair(kDefaultDeviceId, cameraId);
- }
-
std::scoped_lock lock(mLock);
auto iterator = mCameraIdToDeviceIdMappedCameraIdPairMap.find(cameraId);
if (iterator != mCameraIdToDeviceIdMappedCameraIdPairMap.end()) {
@@ -102,10 +78,6 @@
}
int VirtualDeviceCameraIdMapper::getNumberOfCameras(int32_t deviceId) const {
- if (!vd_flags::camera_device_awareness()) {
- return 0;
- }
-
int numOfCameras = 0;
std::scoped_lock lock(mLock);
for (const auto& [deviceIdMappedCameraIdPair, _]
@@ -119,11 +91,6 @@
std::optional<std::string> VirtualDeviceCameraIdMapper::getActualCameraId(
int api1CameraId, int32_t deviceId) const {
- if (!vd_flags::camera_device_awareness()) {
- ALOGV("%s: Device-aware camera feature is not enabled", __func__);
- return std::nullopt;
- }
-
int matchingCameraIndex = 0;
std::scoped_lock lock(mLock);
for (const auto& [deviceIdMappedCameraIdPair, actualCameraId]
@@ -140,4 +107,4 @@
return std::nullopt;
}
-} // namespace android
\ No newline at end of file
+} // namespace android