Merge "camera: check Intent entry count before reading it" (f02f06c4) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/client2/Parameters.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -1750,6 +1750,9 @@ status_t Parameters::updateRequest(CameraMetadata *request) const {

		camera_metadata_entry_t intent =
		request->find(ANDROID_CONTROL_CAPTURE_INTENT);

		if (intent.count == 0) return BAD_VALUE;

		if (intent.data.u8[0] == ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE) {
		res = request->update(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,
		fastInfo.bestStillCaptureFpsRange, 2);