Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag" into sc-dev (53a58911) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -142,19 +142,19 @@ int32_t SessionConfigurationUtils::getAppropriateModeTag(int32_t defaultTag, boo
		case ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:
		return ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:
		return ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS;
		return ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS:
		return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS:
		return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS:
		return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS;
		return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS:
		return ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS:
		return ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS:
		return ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS;
		return ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION;
		case ANDROID_SENSOR_OPAQUE_RAW_SIZE:
		return ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION;
		case ANDROID_LENS_INTRINSIC_CALIBRATION: