Snap for 12644741 from 5073202a4c52ae8ac0060a21c171981fee26375d to 25Q1-release (e76fdaf4) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -229,3 +229,9 @@ flag {
		bug: "359944765"
		}

		flag {
		namespace: "camera_platform"
		name: "feature_combination_baklava"
		description: "Add new feature combination query version for Baklava"
		bug: "370778206"
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1684,8 +1684,9 @@ ndk::ScopedAStatus CameraDevice::ServiceCallback::onCaptureStarted(
		__FUNCTION__, burstId, cbh.mRequests.size());
		dev->setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_SERVICE);
		}

		sp<CaptureRequest> request = cbh.mRequests[burstId];
		ALOGE("%s: request = %p", __FUNCTION__, request.get());
		ALOGV("%s: request = %p", __FUNCTION__, request.get());
		sp<AMessage> msg = nullptr;
		if (v2Callback) {
		msg = new AMessage(kWhatCaptureStart2, dev->mHandler);

+15 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ aconfig_declarations {
		"//frameworks/base/api",
		"//frameworks/base/core/res",
		],
		exportable: true,
		}

		aconfig_declarations {
		@@ -151,6 +152,20 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		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",
		mode: "exported",
		apex_available: [
		"com.android.btservices",
		],
		visibility: [
		"//packages/modules/Bluetooth:__subpackages__",
		],
		}

		java_aconfig_library {
		name: "android.media.audiopolicy-aconfig-java",
		aconfig_declarations: "android.media.audiopolicy-aconfig",

+2 −2

Original line number	Diff line number	Diff line
		@@ -139,8 +139,8 @@ class C2SoftDav1dDec::IntfImpl : public SimpleInterface<void>::BaseParams {
		addParameter(DefineParam(mMaxSize, C2_PARAMKEY_MAX_PICTURE_SIZE)
		.withDefault(new C2StreamMaxPictureSizeTuning::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048, 2),
		C2F(mSize, height).inRange(2, 2048, 2),
		C2F(mSize, width).inRange(2, 4096, 2),
		C2F(mSize, height).inRange(2, 4096, 2),
		})
		.withSetter(MaxPictureSizeSetter, mSize)
		.build());

+4 −4

Original line number	Diff line number	Diff line
		@@ -69,8 +69,8 @@ public:
		DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE)
		.withDefault(new C2StreamPictureSizeInfo::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048),
		C2F(mSize, height).inRange(2, 2048),
		C2F(mSize, width).inRange(2, 4096),
		C2F(mSize, height).inRange(2, 4096),
		})
		.withSetter(SizeSetter)
		.build());
		@@ -167,8 +167,8 @@ public:
		DefineParam(mMaxSize, C2_PARAMKEY_MAX_PICTURE_SIZE)
		.withDefault(new C2StreamMaxPictureSizeTuning::output(0u, 320, 240))
		.withFields({
		C2F(mSize, width).inRange(2, 2048, 2),
		C2F(mSize, height).inRange(2, 2048, 2),
		C2F(mSize, width).inRange(2, 4096, 2),
		C2F(mSize, height).inRange(2, 4096, 2),
		})
		.withSetter(MaxPictureSizeSetter, mSize)
		.build());