Merge "Camera: Trim required stream combination queries" into main
diff --git a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
index 440c2b3..5da515b 100644
--- a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
+++ b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
@@ -372,66 +372,13 @@
* the particular StreamConfiguration is supported, the camera HAL must take all
* the keys in sessionParameters into consideration.
*
- * 2. For version 3 of this interface, the camera compliance test will verify that
+ * 2. For version 3 of this interface, the camera compliance tests will verify that
* isStreamCombinationWithSettingsSupported behaves properly for all combinations of
- * below features. This function must return true for all supported combinations,
- * and return false for non-supported feature combinations. The list of features
- * required may grow in future versions. The additional metadata entries in
- * StreamConfiguration::sessionParameters are {CONTROL_AE_TARGET_FPS_RANGE,
- * CONTROL_VIDEO_STABILIZATION_MODE}.
- *
- * - Stream Combinations (a subset of LEGACY device mandatory stream combinations):
- * {
- * // 4:3 16:9
- * // S1440P: 1920 x 1440 2560 x 1440
- * // S1080P: 1440 x 1080 1920 x 1080
- * // S720P: 960 x 720 1280 x 720
- *
- * // Simple preview, GPU video processing, or no-preview video recording
- * {PRIV, MAXIMUM},
- * {PRIV, PREVIEW},
- * {PRIV, S1440P},
- * {PRIV, S1080P},
- * {PRIV, S720P},
- * // In-application video/image processing
- * {YUV, MAXIMUM},
- * {YUV, PREVIEW},
- * {YUV, S1440P},
- * {YUV, S1080P},
- * {YUV, S720P},
- * // Standard still imaging.
- * {PRIV, PREVIEW, JPEG, MAXIMUM},
- * {PRIV, S1440P, JPEG, MAXIMUM},
- * {PRIV, S1080P, JPEG, MAXIMUM},
- * {PRIV, S720P, JPEG, MAXIMUM},
- * {PRIV, S1440P, JPEG, S1440P},
- * {PRIV, S1080P, JPEG, S1080P},
- * {PRIV, S720P, JPEG, S1080P},
- * // In-app processing plus still capture.
- * {YUV, PREVIEW, JPEG, MAXIMUM},
- * {YUV, S1440P, JPEG, MAXIMUM},
- * {YUV, S1080P, JPEG, MAXIMUM},
- * {YUV, S720P, JPEG, MAXIMUM},
- * // Standard recording.
- * {PRIV, PREVIEW, PRIV, PREVIEW},
- * {PRIV, S1440P, PRIV, S1440P},
- * {PRIV, S1080P, PRIV, S1080P},
- * {PRIV, S720P, PRIV, S720P},
- * // Preview plus in-app processing.
- * {PRIV, PREVIEW, YUV, PREVIEW},
- * {PRIV, S1440P, YUV, S1440P},
- * {PRIV, S1080P, YUV, S1080P},
- * {PRIV, S720P, YUV, S720P},
- * }
- * - VIDEO_STABILIZATION_MODES: {OFF, PREVIEW}
- * - AE_TARGET_FPS_RANGE: {{*, 30}, {*, 60}}
- * - DYNAMIC_RANGE_PROFILE: {STANDARD, HLG10}
- *
- * Note: If a combination contains a S1440P, S1080P, or S720P stream,
- * both 4:3 and 16:9 aspect ratio will be considered. For example, for the
- * stream combination of {PRIV, S1440P, JPEG, MAXIMUM}, and if MAXIMUM ==
- * 4032 x 3024, the camera compliance test will verify both
- * {PRIV, 1920 x 1440, JPEG, 4032 x 3024} and {PRIV, 2560 x 1440, JPEG, 4032 x 2268}.
+ * features described in the android.info.sessionConfigurationQueryVersion section of
+ * /system/media/camera/docs/docs.html. This function must
+ * return true for all supported combinations, and return false for non-supported
+ * feature combinations. The list of feature combinations required may grow in future
+ * HAL versions.
*
* @param streams The StreamConfiguration to be tested, with optional CaptureRequest parameters.
*