Merge Android 14 QPR3 to AOSP main (51fb54ce) · Commits · e / os / android_frameworks_av

camera/Android.bp

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@
	// limitations under the License.		// limitations under the License.

	package {		package {
			default_team: "trendy_team_camera_framework",
	default_applicable_licenses: ["frameworks_av_camera_license"],		default_applicable_licenses: ["frameworks_av_camera_license"],
	}		}

	@@ -65,6 +66,7 @@ cc_library_headers {
	name: "camera_headers",		name: "camera_headers",
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
	}		}

	cc_library {		cc_library {
	name: "libcamera_client",		name: "libcamera_client",

	@@ -121,9 +123,13 @@ cc_library {
	],		],
	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	"include/camera"		"include/camera",
			],
			export_shared_lib_headers: [
			"libcamera_metadata",
			"libnativewindow",
			"libgui",
	],		],
	export_shared_lib_headers: ["libcamera_metadata", "libnativewindow", "libgui"],

	cflags: [		cflags: [
	"-Werror",		"-Werror",
	@@ -153,7 +159,7 @@ cc_library_host_static {

	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	"include/camera"		"include/camera",
	],		],
	}		}

camera/CameraMetadata.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -880,7 +880,7 @@ status_t CameraMetadata::getTagFromName(const char *name,
	return OK;		return OK;
	}		}

	metadata_vendor_id_t CameraMetadata::getVendorId() {		metadata_vendor_id_t CameraMetadata::getVendorId() const {
	return get_camera_metadata_vendor_id(mBuffer);		return get_camera_metadata_vendor_id(mBuffer);
	}		}

camera/VendorTagDescriptor.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -466,7 +466,7 @@ const char* VendorTagDescriptorCache::getTagName(uint32_t tag,

	int VendorTagDescriptorCache::getTagType(uint32_t tag,		int VendorTagDescriptorCache::getTagType(uint32_t tag,
	metadata_vendor_id_t id) const {		metadata_vendor_id_t id) const {
	int ret = 0;		int ret = -1;
	auto desc = mVendorMap.find(id);		auto desc = mVendorMap.find(id);
	if (desc != mVendorMap.end()) {		if (desc != mVendorMap.end()) {
	ret = desc->second->getTagType(tag);		ret = desc->second->getTagType(tag);

camera/aidl/android/hardware/ICameraService.aidl

+22 −8

Original line number	Original line	Diff line number	Diff line
	@@ -281,11 +281,25 @@ interface ICameraService
	* Check whether a particular session configuration with optional session parameters		* Check whether a particular session configuration with optional session parameters
	* has camera device support.		* has camera device support.
	*		*
	* @param cameraId The camera id to query session configuration on		* @param cameraId The camera id to query session configuration for
	* @param sessionConfiguration Specific session configuration to be verified.		* @param sessionConfiguration Specific session configuration to be verified.
	* @return true - in case the stream combination is supported.		* @return true - in case the stream combination is supported.
	* false - in case there is no device support.		* false - in case there is no device support.
	*/		*/
	boolean isSessionConfigurationWithParametersSupported(@utf8InCpp String cameraId,		boolean isSessionConfigurationWithParametersSupported(@utf8InCpp String cameraId,
	in SessionConfiguration sessionConfiguration);		in SessionConfiguration sessionConfiguration);

			/**
			* Get the camera characteristics for a particular session configuration for
			* the given camera device.
			*
			* @param cameraId ID of the device for which the session characteristics must be fetched.
			* @param sessionConfiguration session configuration for which the characteristics
			* must be fetched.
			* @return - characteristics associated with the given session.
			*/
			CameraMetadataNative getSessionCharacteristics(@utf8InCpp String cameraId,
			int targetSdkVersion,
			boolean overrideToPortrait,
			in SessionConfiguration sessionConfiguration);
	}		}

camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -99,15 +99,6 @@ interface ICameraDeviceUser
	*/		*/
	boolean isSessionConfigurationSupported(in SessionConfiguration sessionConfiguration);		boolean isSessionConfigurationSupported(in SessionConfiguration sessionConfiguration);

	/**
	* Get the camera characteristics for a particular session configuration
	*
	* @param sessionConfiguration Specific session configuration for which the characteristics
	* are fetched.
	* @return - characteristics associated with the given session.
	*/
	CameraMetadataNative getSessionCharacteristics(in SessionConfiguration sessionConfiguration);

	void deleteStream(int streamId);		void deleteStream(int streamId);

	/**		/**