Snap for 6512749 from ef0120500e1bfd8da80f0d98e37cd1437627a4ab to mainline-release (6ebc308a) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioRecord.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ status_t AudioRecord::createRecord_l(const Modulo<uint32_t> &epoch, const String
		// use case 3: obtain/release mode
		(mTransfer == TRANSFER_OBTAIN);
		if (!useCaseAllowed) {
		ALOGW("%s(%d): AUDIO_INPUT_FLAG_FAST denied, incompatible transfer = %s",
		ALOGD("%s(%d): AUDIO_INPUT_FLAG_FAST denied, incompatible transfer = %s",
		__func__, mPortId,
		convertTransferToText(mTransfer));
		mFlags = (audio_input_flags_t) (mFlags & ~(AUDIO_INPUT_FLAG_FAST \|

media/libaudioclient/AudioTrack.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1632,7 +1632,7 @@ status_t AudioTrack::createTrack_l()
		mAwaitBoost = true;
		}
		} else {
		ALOGW("%s(%d): AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu -> %zu",
		ALOGD("%s(%d): AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu -> %zu",
		__func__, mPortId, mReqFrameCount, mFrameCount);
		}
		}

services/camera/libcameraservice/CameraService.cpp

+22 −4

Original line number	Diff line number	Diff line
		@@ -467,10 +467,21 @@ void CameraService::onDeviceStatusChanged(const String8& id,
		logDeviceRemoved(idCombo,
		String8::format("Device status changed to %d", newStatus));
		}

		// Avoid calling getSystemCameraKind() with mStatusListenerLock held (b/141756275)
		SystemCameraKind deviceKind = SystemCameraKind::PUBLIC;
		if (getSystemCameraKind(id, &deviceKind) != OK) {
		ALOGE("%s: Invalid camera id %s, skipping", __FUNCTION__, id.string());
		return;
		}
		String16 id16(id), physicalId16(physicalId);
		Mutex::Autolock lock(mStatusListenerLock);
		for (auto& listener : mListenerList) {
		if (shouldSkipStatusUpdates(deviceKind, listener->isVendorListener(),
		listener->getListenerPid(), listener->getListenerUid())) {
		ALOGV("Skipping discovery callback for system-only camera device %s",
		id.c_str());
		continue;
		}
		listener->getListener()->onPhysicalCameraStatusChanged(mapToInterface(newStatus),
		id16, physicalId16);
		}
		@@ -3757,7 +3768,7 @@ void CameraService::updateStatus(StatusInternal status, const String8& cameraId,

		Mutex::Autolock lock(mStatusListenerLock);

		notifyPhysicalCameraStatusLocked(mapToInterface(status), cameraId);
		notifyPhysicalCameraStatusLocked(mapToInterface(status), cameraId, deviceKind);

		for (auto& listener : mListenerList) {
		bool isVendorListener = listener->isVendorListener();
		@@ -3875,7 +3886,8 @@ status_t CameraService::setTorchStatusLocked(const String8& cameraId,
		return OK;
		}

		void CameraService::notifyPhysicalCameraStatusLocked(int32_t status, const String8& cameraId) {
		void CameraService::notifyPhysicalCameraStatusLocked(int32_t status, const String8& cameraId,
		SystemCameraKind deviceKind) {
		Mutex::Autolock lock(mCameraStatesLock);
		for (const auto& state : mCameraStates) {
		std::vector<std::string> physicalCameraIds;
		@@ -3891,6 +3903,12 @@ void CameraService::notifyPhysicalCameraStatusLocked(int32_t status, const Strin

		String16 id16(state.first), physicalId16(cameraId);
		for (auto& listener : mListenerList) {
		if (shouldSkipStatusUpdates(deviceKind, listener->isVendorListener(),
		listener->getListenerPid(), listener->getListenerUid())) {
		ALOGV("Skipping discovery callback for system-only camera device %s",
		cameraId.c_str());
		continue;
		}
		listener->getListener()->onPhysicalCameraStatusChanged(status,
		id16, physicalId16);
		}

services/camera/libcameraservice/CameraService.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1005,7 +1005,8 @@ private:
		hardware::camera::common::V1_0::TorchModeStatus status);

		// notify physical camera status when the physical camera is public.
		void notifyPhysicalCameraStatusLocked(int32_t status, const String8& cameraId);
		void notifyPhysicalCameraStatusLocked(int32_t status, const String8& cameraId,
		SystemCameraKind deviceKind);

		// IBinder::DeathRecipient implementation
		virtual void binderDied(const wp<IBinder> &who);