Camera: Consider no constraints case JpegRComposite streams
10-bit dynamic range profiles that do not have concurrent capture
constraints are advertised by clearing the constraints bitmap
value.
Consider this particular case when configuring the Jpeg/R composite
stream.
Bug: 278922657
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java#testJpegR
Change-Id: I45b2f164f8c57a799e599d4c9865de68995a0a06
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 2ebb98a..b7c86c6 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1110,7 +1110,7 @@
for (size_t i = 0; i < entry.count; i += 3) {
if (entry.data.i64[i] == profile) {
- if (entry.data.i64[i+1] & concurrentProfile) {
+ if ((entry.data.i64[i+1] == 0) || (entry.data.i64[i+1] & concurrentProfile)) {
return true;
}
}