commit b2218589a03f4201842489a7338e9254321dc87d
author Jayant Chowdhary <jchowdhary@google.com> Fri Mar 13 14:07:28 2020 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Fri Mar 13 14:20:26 2020 -0700
tree 82acb25fadaa2382af6a82031420c3443063c4e0
parent 21570735331afe4083836213f21cc269f90b3b4f

camera cts: Add SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS to CameraDeviceInfo

Bug: 151462833

Test: builds

Change-Id: If3a73562748f8b4b1822524faeb20b7fb8f133e3
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java

diff --git a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
index 216d764..4e2a441 100644
--- a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
+++ b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
@@ -490,6 +490,7 @@
         charsKeyNames.add(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_CROPPING_TYPE.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_STREAM_COMBINATIONS.getName());
+        charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES.getName());
         charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT1.getName());
         charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT2.getName());