Merge "CameraService: Fix missing torch state callback" am: 5a80267cc4 am: 28c5bca5a9 (b98450a7) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+11 −6

Original line number	Diff line number	Diff line
		@@ -209,6 +209,14 @@ void CameraService::pingCameraServiceProxy() {
		proxyBinder->pingForUserUpdate();
		}

		void CameraService::broadcastTorchModeStatus(const String8& cameraId, TorchModeStatus status) {
		Mutex::Autolock lock(mStatusListenerLock);

		for (auto& i : mListenerList) {
		i->onTorchStatusChanged(mapToInterface(status), String16{cameraId});
		}
		}

		CameraService::~CameraService() {
		VendorTagDescriptor::clearGlobalVendorTagDescriptor();
		mUidPolicy->unregisterSelf();
		@@ -247,6 +255,8 @@ void CameraService::addStates(const String8 id) {
		if (mFlashlight->hasFlashUnit(id)) {
		Mutex::Autolock al(mTorchStatusMutex);
		mTorchStatusMap.add(id, TorchModeStatus::AVAILABLE_OFF);

		broadcastTorchModeStatus(id, TorchModeStatus::AVAILABLE_OFF);
		}

		updateCameraNumAndIds();
		@@ -399,12 +409,7 @@ void CameraService::onTorchStatusChangedLocked(const String8& cameraId,
		}
		}

		{
		Mutex::Autolock lock(mStatusListenerLock);
		for (auto& i : mListenerList) {
		i->onTorchStatusChanged(mapToInterface(newStatus), String16{cameraId});
		}
		}
		broadcastTorchModeStatus(cameraId, newStatus);
		}

		Status CameraService::getNumberOfCameras(int32_t type, int32_t* numCameras) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -857,6 +857,8 @@ private:
		static sp<hardware::ICameraServiceProxy> getCameraServiceProxy();
		static void pingCameraServiceProxy();

		void broadcastTorchModeStatus(const String8& cameraId,
		hardware::camera::common::V1_0::TorchModeStatus status);
		};

		} // namespace android