Snap for 11847214 from f00d02254db571ae3eb54f3e6b7b088e27cefbe1 to 24Q3-release (0c9775f0) · Commits · e / os / android_frameworks_av

camera/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ filegroup {
		srcs: [
		"aidl/android/hardware/CameraExtensionSessionStats.aidl",
		"aidl/android/hardware/ICameraService.aidl",
		"aidl/android/hardware/CameraIdRemapping.aidl",
		"aidl/android/hardware/ICameraServiceListener.aidl",
		"aidl/android/hardware/ICameraServiceProxy.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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;

		/**
		* Specifies a remapping of Camera Ids.
		*
		* Example: For a given package, a remapping of camera id0 to id1 specifies
		* that any operation to perform on id0 should instead be performed on id1.
		*
		* @hide
		*/
		parcelable CameraIdRemapping {
		/**
		* Specifies remapping of Camera Ids per package.
		*/
		parcelable PackageIdRemapping {
		/** Package Name (e.g. com.android.xyz). */
		@utf8InCpp String packageName;
		/**
		* Ordered list of Camera Ids to replace. Only Camera Ids present in this list will be
		* affected.
		*/
		@utf8InCpp List<String> cameraIdsToReplace;
		/**
		* Ordered list of updated Camera Ids, where updatedCameraIds[i] corresponds to
		* the updated camera id for cameraIdsToReplace[i].
		*/
		@utf8InCpp List<String> updatedCameraIds;
		}

		/**
		* List of Camera Id remappings to perform.
		*/
		List<PackageIdRemapping> packageIdRemappings;
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.hardware.camera2.utils.CameraIdAndSessionConfiguration;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.ICameraServiceListener;
		import android.hardware.CameraInfo;
		import android.hardware.CameraIdRemapping;
		import android.hardware.CameraStatus;
		import android.hardware.CameraExtensionSessionStats;

		@@ -209,22 +208,6 @@ interface ICameraService
		in CameraIdAndSessionConfiguration[] sessions,
		int targetSdkVersion, int deviceId, int devicePolicy);

		/**
		* Remap Camera Ids in the CameraService.
		*
		* Once this is in effect, all binder calls in the ICameraService that
		* use logicalCameraId should consult remapping state to arrive at the
		* correct cameraId to perform the operation on.
		*
		* Note: Before the new cameraIdRemapping state is applied, the previous
		* state is cleared.
		*
		* @param cameraIdRemapping the camera ids to remap. Sending an unpopulated
		* cameraIdRemapping object will result in clearing of any previous
		* cameraIdRemapping state in the camera service.
		*/
		void remapCameraIds(in CameraIdRemapping cameraIdRemapping);

		/**
		* Inject Session Params into an existing camera session.
		*

+8 −0

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

		flag {
		name: "abs_volume_index_fix"
		namespace: "media_audio"
		description:
		"Fix double attenuation and index jumps in absolute volume mode"
		bug: "340693050"
		}

		flag {
		name: "alarm_min_volume_zero"
		namespace: "media_audio"

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ std::unique_ptr<Snapshot> Reader::getSnapshot(bool flush)
		do {
		availToRead = mFifoReader->obtain(iovec, capacity, NULL /timeout/, &lostTemp);
		lost += lostTemp;
		} while (availToRead < 0 \|\| ++tries <= kMaxObtainTries);
		} while (availToRead < 0 && ++tries <= kMaxObtainTries);

		if (availToRead <= 0) {
		ALOGW_IF(availToRead < 0, "NBLog Reader %s failed to catch up with Writer", mName.c_str());