Snap for 13033097 from 8e4e582c596f1f94110059d9dc7e5f48c9bce158 to 25Q2-release (d30c5f10) · Commits · e / os / android_frameworks_av

aidl/android/media/IAudioManagerNative.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,5 +51,5 @@ interface IAudioManagerNative {
		* @param portId Port id to update
		* @param event the mute event containing info about the mute
		*/
		void portMuteEvent(in int portId, in int event);
		oneway void portMuteEvent(in int portId, in int event);
		}

camera/ndk/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ cc_library_shared {
		],
		shared_libs: [
		"android.companion.virtual.virtualdevice_aidl-cpp",
		"android.companion.virtualdevice.flags-aconfig-cc",
		"android.hardware.common-V2-cpp",
		"android.hardware.common.fmq-V1-cpp",
		"camera_platform_flags_c_lib",

camera/ndk/impl/ACameraManager.cpp

+2 −9

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#define LOG_TAG "ACameraManager"

		#include "ACameraManager.h"
		#include <android_companion_virtualdevice_flags.h>
		#include <camera/CameraUtils.h>
		#include <camera/StringUtils.h>
		#include <camera/VendorTagDescriptor.h>
		@@ -31,7 +30,6 @@
		#include <com_android_internal_camera_flags.h>

		using namespace android::acam;
		namespace vd_flags = android::companion::virtualdevice::flags;
		namespace flags = com::android::internal::camera::flags;

		namespace android {
		@@ -62,10 +60,6 @@ sp<IVirtualDeviceManagerNative> getVirtualDeviceManager() {
		// Returns device id calling process is running on.
		// If the process cannot be attributed to single virtual device id, returns default device id.
		int getCurrentDeviceId() {
		if (!vd_flags::camera_device_awareness()) {
		return kDefaultDeviceId;
		}

		auto vdm = getVirtualDeviceManager();
		if (vdm == nullptr) {
		return kDefaultDeviceId;
		@@ -91,7 +85,7 @@ int getCurrentDeviceId() {

		// Returns device policy for POLICY_TYPE_CAMERA corresponding to deviceId.
		DevicePolicy getDevicePolicyForDeviceId(const int deviceId) {
		if (!vd_flags::camera_device_awareness() \|\| deviceId == kDefaultDeviceId) {
		if (deviceId == kDefaultDeviceId) {
		return DevicePolicy::DEVICE_POLICY_DEFAULT;
		}

		@@ -113,8 +107,7 @@ DevicePolicy getDevicePolicyForDeviceId(const int deviceId) {

		// Returns true if camera owned by device cameraDeviceId can be accessed within deviceContext.
		bool isCameraAccessible(const DeviceContext deviceContext, const int cameraDeviceId) {
		if (!vd_flags::camera_device_awareness() \|\|
		deviceContext.policy == DevicePolicy::DEVICE_POLICY_DEFAULT) {
		if (deviceContext.policy == DevicePolicy::DEVICE_POLICY_DEFAULT) {
		return cameraDeviceId == kDefaultDeviceId;
		}
		return deviceContext.deviceId == cameraDeviceId;

media/codec2/hal/client/client.cpp

+7 −4

Original line number	Diff line number	Diff line
		@@ -3111,10 +3111,13 @@ c2_status_t Codec2Client::Component::queue(
		}
		if (mAidlBase) {
		c2_aidl::WorkBundle workBundle;
		{
		ScopedTrace trace(ATRACE_TAG, "CCodec::Codec2Client::ToAidl");
		if (!c2_aidl::utils::ToAidl(&workBundle, *items, mAidlBufferPoolSender.get())) {
		LOG(ERROR) << "queue -- bad input.";
		return C2_TRANSACTION_FAILED;
		}
		}
		::ndk::ScopedAStatus transStatus = mAidlBase->queue(workBundle);
		return GetC2Status(transStatus, "queue");
		}
		@@ -3446,7 +3449,7 @@ status_t Codec2Client::Component::queueToOutputSurface(
		const C2ConstGraphicBlock& block,
		const QueueBufferInput& input,
		QueueBufferOutput* output) {
		ScopedTrace trace(ATRACE_TAG,"Codec2Client::Component::queueToOutputSurface");
		ScopedTrace trace(ATRACE_TAG,"CCodec::Codec2Client::Component::queueToOutputSurface");
		if (mAidlBase) {
		std::shared_ptr<AidlGraphicBufferAllocator> gba =
		mGraphicBufferAllocators->current();

media/codec2/sfplugin/CCodec.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@

		//#define LOG_NDEBUG 0
		#define LOG_TAG "CCodec"
		#define ATRACE_TAG ATRACE_TAG_VIDEO
		#include <utils/Log.h>
		#include <utils/Trace.h>

		#include <sstream>
		#include <thread>
		@@ -883,6 +885,7 @@ struct CCodec::ClientListener : public Codec2Client::Listener {
		const std::weak_ptr<Codec2Client::Component>& component,
		std::list<std::unique_ptr<C2Work>>& workItems) override {
		(void)component;
		ScopedTrace trace(ATRACE_TAG, "CCodec::ClientListener-WorkDone");
		sp<CCodec> codec(mCodec.promote());
		if (!codec) {
		return;
		@@ -2878,6 +2881,7 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) {
		break;
		}
		case kWhatWorkDone: {
		ScopedTrace trace(ATRACE_TAG, "CCodec::msg-onWorkDone");
		std::unique_ptr<C2Work> work;
		bool shouldPost = false;
		{