Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master (80279348) · Commits · e / os / android_frameworks_av

apex/manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media",
		"version": 300900700
		"version": 300000000
		}

camera/ICameraClient.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,8 @@ status_t BnCameraClient::onTransact(
		camera_frame_metadata_t metadata;
		if (data.dataAvail() > 0) {
		metadata.number_of_faces = data.readInt32();
		if (metadata.number_of_faces <= 0 \|\|
		// Zero faces is a valid case, to notify clients that no faces are now visible
		if (metadata.number_of_faces < 0 \|\|
		metadata.number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {
		ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata.number_of_faces);
		return BAD_VALUE;

camera/ndk/include/camera/NdkCameraMetadataTags.h

+11 −5

Original line number	Diff line number	Diff line
		@@ -1890,10 +1890,8 @@ typedef enum acamera_metadata_tag {
		* <li>ACaptureRequest</li>
		* </ul></p>
		*
		* <p>Instead of using ACAMERA_SCALER_CROP_REGION with dual purposes of crop and zoom, the
		* application can now choose to use this tag to specify the desired zoom level. The
		* ACAMERA_SCALER_CROP_REGION can still be used to specify the horizontal or vertical
		* crop to achieve aspect ratios different than the native camera sensor.</p>
		* <p>Instead of using ACAMERA_SCALER_CROP_REGION for zoom, the application can now choose to
		* use this tag to specify the desired zoom level.</p>
		* <p>By using this control, the application gains a simpler way to control zoom, which can
		* be a combination of optical and digital zoom. For example, a multi-camera system may
		* contain more than one lens with different focal lengths, and the user can use optical
		@@ -3413,16 +3411,24 @@ typedef enum acamera_metadata_tag {
		* respectively.</p>
		* <p>The camera device may adjust the crop region to account for rounding and other hardware
		* requirements; the final crop region used will be included in the output capture result.</p>
		* <p>The camera sensor output aspect ratio depends on factors such as output stream
		* combination and ACAMERA_CONTROL_AE_TARGET_FPS_RANGE, and shouldn't be adjusted by using
		* this control. And the camera device will treat different camera sensor output sizes
		* (potentially with in-sensor crop) as the same crop of
		* ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE. As a result, the application shouldn't assume the
		* maximum crop region always maps to the same aspect ratio or field of view for the
		* sensor output.</p>
		* <p>Starting from API level 30, it's strongly recommended to use ACAMERA_CONTROL_ZOOM_RATIO
		* to take advantage of better support for zoom with logical multi-camera. The benefits
		* include better precision with optical-digital zoom combination, and ability to do
		* zoom-out from 1.0x. When using ACAMERA_CONTROL_ZOOM_RATIO for zoom, the crop region in
		* the capture request must be either letterboxing or pillarboxing (but not both). The
		* the capture request should be left as the default activeArray size. The
		* coordinate system is post-zoom, meaning that the activeArraySize or
		* preCorrectionActiveArraySize covers the camera device's field of view "after" zoom. See
		* ACAMERA_CONTROL_ZOOM_RATIO for details.</p>
		* <p>The data representation is int[4], which maps to (left, top, width, height).</p>
		*
		* @see ACAMERA_CONTROL_AE_TARGET_FPS_RANGE
		* @see ACAMERA_CONTROL_ZOOM_RATIO
		* @see ACAMERA_DISTORTION_CORRECTION_MODE
		* @see ACAMERA_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

drm/libmediadrm/DrmMetricsConsumer.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ template <typename T> std::string GetAttributeName(T type);
		template <> std::string GetAttributeName<KeyStatusType>(KeyStatusType type) {
		static const char *type_names[] = {"USABLE", "EXPIRED",
		"OUTPUT_NOT_ALLOWED", "STATUS_PENDING",
		"INTERNAL_ERROR"};
		if (((size_t)type) > arraysize(type_names)) {
		"INTERNAL_ERROR", "USABLE_IN_FUTURE"};
		if (((size_t)type) >= arraysize(type_names)) {
		return "UNKNOWN_TYPE";
		}
		return type_names[(size_t)type];
		@@ -48,7 +48,7 @@ template <> std::string GetAttributeName<EventType>(EventType type) {
		static const char *type_names[] = {"PROVISION_REQUIRED", "KEY_NEEDED",
		"KEY_EXPIRED", "VENDOR_DEFINED",
		"SESSION_RECLAIMED"};
		if (((size_t)type) > arraysize(type_names)) {
		if (((size_t)type) >= arraysize(type_names)) {
		return "UNKNOWN_TYPE";
		}
		return type_names[(size_t)type];

media/audioserver/audioserver.rc

+14 −6

Original line number	Diff line number	Diff line
		@@ -6,8 +6,11 @@ service audioserver /system/bin/audioserver
		capabilities BLOCK_SUSPEND
		ioprio rt 4
		task_profiles ProcessCapacityHigh HighPerformance

		onrestart setprop sys.audio.restart.hal 1
		onrestart restart vendor.audio-hal
		onrestart restart vendor.audio-hal-4-0-msd
		# Keep the original service names for backward compatibility
		onrestart restart vendor.audio-hal-2-0
		onrestart restart audio-hal-2-0

		on property:vts.native_server.on=1
		stop audioserver
		@@ -37,11 +40,16 @@ on property:init.svc.audioserver=running
		start audio-hal-2-0

		on property:sys.audio.restart.hal=1
		restart vendor.audio-hal
		restart vendor.audio-hal-4-0-msd
		# See b/159966243. Avoid restart loop between audioserver and HAL.
		# Keep the original service names for backward compatibility
		restart vendor.audio-hal-2-0
		restart audio-hal-2-0
		stop vendor.audio-hal
		stop vendor.audio-hal-4-0-msd
		stop vendor.audio-hal-2-0
		stop audio-hal-2-0
		start vendor.audio-hal
		start vendor.audio-hal-4-0-msd
		start vendor.audio-hal-2-0
		start audio-hal-2-0
		# reset the property
		setprop sys.audio.restart.hal 0