Snap for 6294963 from bc8a9381f5bed2dc8804644dd57e5b1777994858 to rvc-release (8bd21c4f) · Commits · e / os / android_frameworks_av

apex/Android.bp

+2 −2

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

		// Use a custom AndroidManifest.xml used for API targeting.
		androidManifest: ":com.android.media-androidManifest",

		min_sdk_version: "29",
		legacy_android10_support: true,
		}

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

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

		min_sdk_version: "29",
		legacy_android10_support: true,
		}

media/codec2/hidl/client/client.cpp

+16 −6

Original line number	Diff line number	Diff line
		@@ -678,8 +678,13 @@ c2_status_t Codec2Client::createComponent(
		<< ") -- transaction failed.";
		return C2_TRANSACTION_FAILED;
		} 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()
		<< ") -- call failed: " << status << ".";
		}
		return status;
		} else if (!*component) {
		LOG(ERROR) << "createComponent(" << name.c_str()
		@@ -718,8 +723,13 @@ c2_status_t Codec2Client::createInterface(
		<< ") -- transaction failed.";
		return C2_TRANSACTION_FAILED;
		} 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 << ".";
		}
		return status;
		}

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

		std::shared_ptr<Codec2Client> Codec2Client::_CreateFromIndex(size_t 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);
		CHECK(baseStore) << "Codec2 service \"" << name << "\""
		" 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);
		}

media/extractors/midi/Android.bp

+4 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@ cc_library {
		"libsonivox",
		"libstagefright_foundation",
		"libwatchdog",
		],

		shared_libs: [
		"libbase",
		]
		],
		}

media/extractors/mpeg2/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ cc_library {
		],

		shared_libs: [
		"libbase",
		"libcgrouprc#29",
		"libvndksupport#29",
		],
		@@ -28,7 +29,6 @@ cc_library {
		"android.hidl.memory@1.0",
		"android.hidl.token@1.0",
		"android.hidl.token@1.0-utils",
		"libbase",
		"libcutils",
		"libhidlbase",
		"libhidlmemory",

media/libwatchdog/Android.bp

+1 −3

Original line number	Diff line number	Diff line
		@@ -19,10 +19,8 @@ cc_library {
		],
		export_include_dirs: ["include"],
		shared_libs: [
		"liblog",
		],
		static_libs: [
		"libbase",
		"liblog",
		],
		target: {
		windows: {