Merge "Clean up virtual camera flags from the camera framework" into main (44af33ff) · Commits · e / os / android_frameworks_av

camera/ndk/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ cc_library_shared {
		],
		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",

camera/ndk/impl/ACameraManager.cpp

+2 −9

Original line number	Diff line number	Diff line
		@@ -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 @@ sp<IVirtualDeviceManagerNative> getVirtualDeviceManager() {
		// 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 @@ int getCurrentDeviceId() {

		// 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 @@ DevicePolicy getDevicePolicyForDeviceId(const int deviceId) {

		// 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;

services/camera/libcameraservice/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ cc_defaults {
		"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",

services/camera/libcameraservice/CameraService.cpp

+18 −22

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -130,7 +129,6 @@ using hardware::camera2::utils::CameraIdAndSessionConfiguration;
		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
		@@ -365,7 +363,6 @@ void CameraService::filterAPI1SystemCameraLocked(
		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,
		@@ -382,7 +379,6 @@ void CameraService::filterAPI1SystemCameraLocked(
		if (deviceId != kDefaultDeviceId) {
		continue;
		}
		}

		SystemCameraKind deviceKind = SystemCameraKind::PUBLIC;
		if (getSystemCameraKind(cameraId, &deviceKind) != OK) {
		@@ -800,7 +796,7 @@ Status CameraService::getNumberOfCameras(int32_t type,
		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();
		@@ -1263,7 +1259,7 @@ Status CameraService::getCameraInfo(int cameraId, int rotationOverride,

		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);
		@@ -5938,7 +5934,7 @@ void CameraService::updateStatus(StatusInternal status, const std::string& camer
		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);

services/camera/libcameraservice/common/CameraProviderManager.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -3649,8 +3648,7 @@ void CameraProviderManager::filterLogicalCameraIdsLocked(
		}

		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