Camera: Handle public physical camera for feature combination query
In case a logical camera contains a physical camera that's publicly
available, we need to make sure that physical camera's characteristics
can be fetched.
The current implementation only stores the hidden physical cameras'
characteristics within the logical camera's DeviceInfo. Querying
a public physical camera's characteristics will fail.
Test: test_multi_camera_alignment on vendor devices
Bug: 331891597
Bug: 331591275
Change-Id: I273ad49b4dba27431eeb4a5240a350051effd343
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index 2e97207..248227d 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.h
+++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -646,6 +646,7 @@
virtual status_t isSessionConfigurationSupported(
const SessionConfiguration &/*configuration*/,
bool /*overrideForPerfClass*/,
+ camera3::metadataGetter /*getMetadata*/,
bool /*checkSessionParams*/,
bool * /*status*/) {
return INVALID_OPERATION;
@@ -777,8 +778,6 @@
std::vector<int64_t>* stallDurations,
const camera_metadata_entry& halStreamConfigs,
const camera_metadata_entry& halStreamDurations);
-
- CameraMetadata deviceInfo(const std::string &id);
};
protected:
std::string mType;