Snap for 6296837 from 9fa76c9b7699d82de6dd3beb7e37a2a25b741803 to mainline-release (d4f4cec5) · Commits · e / os / android_frameworks_av

apex/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ apex_defaults {

	// Use a custom AndroidManifest.xml used for API targeting.		// Use a custom AndroidManifest.xml used for API targeting.
	androidManifest: ":com.android.media-androidManifest",		androidManifest: ":com.android.media-androidManifest",
			min_sdk_version: "29",
	legacy_android10_support: true,		legacy_android10_support: true,
	}		}

	@@ -84,7 +84,7 @@ apex_defaults {

	// Use a custom AndroidManifest.xml used for API targeting.		// Use a custom AndroidManifest.xml used for API targeting.
	androidManifest: ":com.android.media.swcodec-androidManifest",		androidManifest: ":com.android.media.swcodec-androidManifest",
			min_sdk_version: "29",
	legacy_android10_support: true,		legacy_android10_support: true,
	}		}

camera/aidl/android/hardware/ICameraService.aidl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ interface ICameraService
	* Get a list of combinations of camera ids which support concurrent streaming.		* Get a list of combinations of camera ids which support concurrent streaming.
	*		*
	*/		*/
	ConcurrentCameraIdCombination[] getConcurrentStreamingCameraIds();		ConcurrentCameraIdCombination[] getConcurrentCameraIds();

	/**		/**
	* Check whether a particular set of session configurations are concurrently supported by the		* Check whether a particular set of session configurations are concurrently supported by the
	@@ -129,7 +129,7 @@ interface ICameraService
	* @return true - the set of concurrent camera id and stream combinations is supported.		* @return true - the set of concurrent camera id and stream combinations is supported.
	* false - the set of concurrent camera id and stream combinations is not supported		* false - the set of concurrent camera id and stream combinations is not supported
	* OR the method was called with a set of camera ids not returned by		* OR the method was called with a set of camera ids not returned by
	* getConcurrentMultiStreamingCameraIds().		* getConcurrentCameraIds().
	*/		*/
	boolean isConcurrentSessionConfigurationSupported(		boolean isConcurrentSessionConfigurationSupported(
	in CameraIdAndSessionConfiguration[] sessions);		in CameraIdAndSessionConfiguration[] sessions);

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -735,9 +735,8 @@ ACameraManager::openCamera(

	if (!serviceRet.isOk() \|\| status != Status::NO_ERROR) {		if (!serviceRet.isOk() \|\| status != Status::NO_ERROR) {
	ALOGE("%s: connect camera device failed", __FUNCTION__);		ALOGE("%s: connect camera device failed", __FUNCTION__);
	// TODO: Convert serviceRet to camera_status_t
	delete device;		delete device;
	return ACAMERA_ERROR_UNKNOWN;		return utils::convertFromHidl(status);
	}		}
	if (deviceRemote == nullptr) {		if (deviceRemote == nullptr) {
	ALOGE("%s: connect camera device failed! remote device is null", __FUNCTION__);		ALOGE("%s: connect camera device failed! remote device is null", __FUNCTION__);

media/codec2/core/include/C2Config.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,6 @@ struct C2Config {
	enum drc_compression_mode_t : int32_t; ///< DRC compression mode		enum drc_compression_mode_t : int32_t; ///< DRC compression mode
	enum drc_effect_type_t : int32_t; ///< DRC effect type		enum drc_effect_type_t : int32_t; ///< DRC effect type
	enum drc_album_mode_t : int32_t; ///< DRC album mode		enum drc_album_mode_t : int32_t; ///< DRC album mode
	enum drc_output_loudness : int32_t; ///< DRC output loudness
	enum intra_refresh_mode_t : uint32_t; ///< intra refresh modes		enum intra_refresh_mode_t : uint32_t; ///< intra refresh modes
	enum level_t : uint32_t; ///< coding level		enum level_t : uint32_t; ///< coding level
	enum ordinal_key_t : uint32_t; ///< work ordering keys		enum ordinal_key_t : uint32_t; ///< work ordering keys

media/codec2/hidl/client/client.cpp

+16 −6

Original line number	Original line	Diff line number	Diff line
	@@ -678,8 +678,13 @@ c2_status_t Codec2Client::createComponent(
	<< ") -- transaction failed.";		<< ") -- transaction failed.";
	return C2_TRANSACTION_FAILED;		return C2_TRANSACTION_FAILED;
	} else if (status != C2_OK) {		} else if (status != C2_OK) {
			if (status == C2_NOT_FOUND) {
			LOG(VERBOSE) << "createComponent(" << name.c_str()
			<< ") -- component not found.";
			} else {
	LOG(ERROR) << "createComponent(" << name.c_str()		LOG(ERROR) << "createComponent(" << name.c_str()
	<< ") -- call failed: " << status << ".";		<< ") -- call failed: " << status << ".";
			}
	return status;		return status;
	} else if (!*component) {		} else if (!*component) {
	LOG(ERROR) << "createComponent(" << name.c_str()		LOG(ERROR) << "createComponent(" << name.c_str()
	@@ -718,8 +723,13 @@ c2_status_t Codec2Client::createInterface(
	<< ") -- transaction failed.";		<< ") -- transaction failed.";
	return C2_TRANSACTION_FAILED;		return C2_TRANSACTION_FAILED;
	} else if (status != C2_OK) {		} else if (status != C2_OK) {
	LOG(ERROR) << "createComponent(" << name.c_str()		if (status == C2_NOT_FOUND) {
			LOG(VERBOSE) << "createInterface(" << name.c_str()
			<< ") -- component not found.";
			} else {
			LOG(ERROR) << "createInterface(" << name.c_str()
	<< ") -- call failed: " << status << ".";		<< ") -- call failed: " << status << ".";
			}
	return status;		return status;
	}		}

	@@ -946,11 +956,11 @@ std::vector<std::shared_ptr<Codec2Client>> Codec2Client::

	std::shared_ptr<Codec2Client> Codec2Client::_CreateFromIndex(size_t index) {		std::shared_ptr<Codec2Client> Codec2Client::_CreateFromIndex(size_t index) {
	std::string const& name = GetServiceNames()[index];		std::string const& name = GetServiceNames()[index];
	LOG(INFO) << "Creating a Codec2 client to service \"" << name << "\"";		LOG(VERBOSE) << "Creating a Codec2 client to service \"" << name << "\"";
	sp<Base> baseStore = Base::getService(name);		sp<Base> baseStore = Base::getService(name);
	CHECK(baseStore) << "Codec2 service \"" << name << "\""		CHECK(baseStore) << "Codec2 service \"" << name << "\""
	" inaccessible for unknown reasons.";		" inaccessible for unknown reasons.";
	LOG(INFO) << "Client to Codec2 service \"" << name << "\" created";		LOG(VERBOSE) << "Client to Codec2 service \"" << name << "\" created";
	return std::make_shared<Codec2Client>(baseStore, index);		return std::make_shared<Codec2Client>(baseStore, index);
	}		}