Snap for 11967491 from 43b331857cbfed24303b43498a9b5a6bc82c2369 to 24Q3-release (63bba76c) · Commits · e / os / android_frameworks_av

camera/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ filegroup {
		name: "libcamera_client_aidl",
		srcs: [
		"aidl/android/hardware/CameraExtensionSessionStats.aidl",
		"aidl/android/hardware/CameraFeatureCombinationStats.aidl",
		"aidl/android/hardware/ICameraService.aidl",
		"aidl/android/hardware/ICameraServiceListener.aidl",
		"aidl/android/hardware/ICameraServiceProxy.aidl",

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware;

		/**
		* {@hide}
		*/
		parcelable CameraFeatureCombinationStats {
		/**
		* Values for feature combination queries
		*/
		const long CAMERA_FEATURE_UNKNOWN = 0;
		const long CAMERA_FEATURE_60_FPS = 1 << 0;
		const long CAMERA_FEATURE_STABILIZATION = 1 << 1;
		const long CAMERA_FEATURE_HLG10 = 1 << 2;
		const long CAMERA_FEATURE_JPEG = 1 << 3;
		const long CAMERA_FEATURE_JPEG_R = 1 << 4;
		const long CAMERA_FEATURE_4K = 1 << 5;

		/**
		* Values for notifyFeatureCombinationStats type
		*/
		enum QueryType {
		QUERY_FEATURE_COMBINATION = 0,
		QUERY_SESSION_CHARACTERISTICS = 1,
		}

		@utf8InCpp String mCameraId;
		int mUid;
		long mFeatureCombination;
		int mQueryType;
		int mStatus;
		}

+7 −0

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

		package android.hardware;

		import android.hardware.CameraFeatureCombinationStats;
		import android.hardware.CameraSessionStats;
		import android.hardware.CameraExtensionSessionStats;

		@@ -37,6 +38,12 @@ interface ICameraServiceProxy
		*/
		oneway void notifyCameraState(in CameraSessionStats cameraSessionStats);

		/**
		* Notify feature combination query for a camera device.
		*/
		oneway void notifyFeatureCombinationStats(
		in CameraFeatureCombinationStats cameraFeatureCombinationStats);

		/**
		* Returns the necessary rotate and crop override for the top activity which
		* will be one of ({@link android.hardware.camera2.CameraMetadata#SCALER_ROTATE_AND_CROP_NONE},

+12 −4

Original line number	Diff line number	Diff line
		@@ -37,6 +37,15 @@ flag {
		bug: "339515899"
		}

		flag {
		name: "fix_input_sharing_logic"
		namespace: "media_audio"
		description:
		"Fix the audio policy logic that decides to reuse or close "
		"input streams when resources are exhausted"
		bug: "338446410"
		}

		flag {
		name: "mutex_priority_inheritance"
		namespace: "media_audio"
		@@ -48,10 +57,9 @@ flag {
		}

		flag {
		name: "fix_input_sharing_logic"
		name: "use_bt_sco_for_media"
		namespace: "media_audio"
		description:
		"Fix the audio policy logic that decides to reuse or close "
		"input streams when resources are exhausted"
		bug: "338446410"
		"Play media strategy over Bluetooth SCO when active"
		bug: "292037886"
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -620,17 +620,19 @@ aaudio_result_t AudioStreamInternal::startClient(const android::AudioClient& cli
		audio_port_handle_t *portHandle) {
		ALOGV("%s() called", __func__);
		if (getServiceHandle() == AAUDIO_HANDLE_INVALID) {
		ALOGE("%s() getServiceHandle() is invalid", __func__);
		return AAUDIO_ERROR_INVALID_STATE;
		}
		aaudio_result_t result = mServiceInterface.startClient(mServiceStreamHandleInfo,
		client, attr, portHandle);
		ALOGV("%s(%d) returning %d", __func__, *portHandle, result);
		ALOGV("%s(), got %d, returning %d", __func__, *portHandle, result);
		return result;
		}

		aaudio_result_t AudioStreamInternal::stopClient(audio_port_handle_t portHandle) {
		ALOGV("%s(%d) called", __func__, portHandle);
		if (getServiceHandle() == AAUDIO_HANDLE_INVALID) {
		ALOGE("%s(%d) getServiceHandle() is invalid", __func__, portHandle);
		return AAUDIO_ERROR_INVALID_STATE;
		}
		aaudio_result_t result = mServiceInterface.stopClient(mServiceStreamHandleInfo, portHandle);