Snap for 12997303 from cf6674f995794476f37a286182cadf16982db745 to 25Q2-release (518b755a) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -254,16 +254,6 @@ flag {
		}
		}

		flag {
		namespace: "camera_platform"
		name: "query_process_state"
		description: "In opChanged, query the process state from AM instead of relying on mUidPolicy"
		bug: "378016494"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "camera_platform"
		name: "fmq_metadata"

+6 −2

Original line number	Diff line number	Diff line
		@@ -156,11 +156,15 @@ java_aconfig_library {
		name: "android.media.audio-aconfig-exported-java",
		aconfig_declarations: "android.media.audio-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		min_sdk_version: "Tiramisu",
		min_sdk_version: "30",
		mode: "exported",
		apex_available: ["com.android.bt"],
		apex_available: [
		"com.android.bt",
		"com.android.permission",
		],
		visibility: [
		"//packages/modules/Bluetooth:__subpackages__",
		"//packages/modules/Permission:__subpackages__",
		],
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,15 @@
		package: "com.android.media.audioserver"
		container: "system"

		flag {
		name: "conditionally_ignore_preferred_input_device"
		namespace: "media_audio"
		description:
		"Allows to ignore preferred device requests in getInputDeviceForAttributes() depending "
		"on the calling context."
		bug: "303079083"
		}

		flag {
		name: "direct_track_reprioritization"
		namespace: "media_audio"

+2 −2

Original line number	Diff line number	Diff line
		@@ -591,9 +591,9 @@ TEST_P(Codec2VideoDecHidlTest, configureTunnel) {
		sp<IGraphicBufferConsumer> consumer;
		BufferQueue::createBufferQueue(&producer, &consumer);

		class DummyConsumerListener : public BnConsumerListener {
		class DummyConsumerListener : public IConsumerListener {
		public:
		DummyConsumerListener() : BnConsumerListener() {}
		DummyConsumerListener() : IConsumerListener() {}
		void onFrameAvailable(const BufferItem&) override {}
		void onBuffersReleased() override {}
		void onSidebandStreamChanged() override {}

+4 −4

Original line number	Diff line number	Diff line
		@@ -76,15 +76,15 @@ struct BqStatistics {
		}
		};

		struct DummyConsumerListener : public android::BnConsumerListener {
		struct DummyConsumerListener : public android::IConsumerListener {
		void onFrameAvailable(const BufferItem& /* item */) override {}
		void onBuffersReleased() override {}
		void onSidebandStreamChanged() override {}
		};

		struct TestConsumerListener : public android::BnConsumerListener {
		struct TestConsumerListener : public android::IConsumerListener {
		TestConsumerListener(const sp<IGraphicBufferConsumer>& consumer)
		: BnConsumerListener(), mConsumer(consumer) {}
		: IConsumerListener(), mConsumer(consumer) {}
		void onFrameAvailable(const BufferItem&) override {
		constexpr static int kRenderDelayUs = 1000000/30; // 30fps
		BufferItem buffer;