Merge "Camera: fix new device register logic" into oc-dev am: 4d351037a5 (3646bc8d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+13 −4

Original line number	Diff line number	Diff line
		@@ -250,9 +250,13 @@ status_t CameraService::enumerateProviders() {
		conflicting.emplace(String8(cost.conflictingDevices[i].c_str()));
		}

		{
		Mutex::Autolock lock(mCameraStatesLock);
		mCameraStates.emplace(id8,
		std::make_shared<CameraState>(id8, cost.resourceCost, conflicting));
		}

		onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT);

		if (mFlashlight->hasFlashUnit(id8)) {
		mTorchStatusMap.add(id8, TorchModeStatus::AVAILABLE_OFF);
		@@ -301,7 +305,12 @@ void CameraService::onDeviceStatusChanged(const String8& id,
		std::shared_ptr<CameraState> state = getCameraState(id);

		if (state == nullptr) {
		if (newStatus == StatusInternal::PRESENT) {
		ALOGW("%s: Unknown camera ID %s, probably newly registered?",
		__FUNCTION__, id.string());
		} else {
		ALOGE("%s: Bad camera ID %s", __FUNCTION__, id.string());
		}
		return;
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -527,9 +527,6 @@ status_t CameraProviderManager::ProviderInfo::initialize() {
		__FUNCTION__, device.c_str(), strerror(-res), res);
		continue;
		}
		if (listener != nullptr) {
		listener->onDeviceStatusChanged(String8(id.c_str()), CameraDeviceStatus::PRESENT);
		}
		}

		for (auto& device : mDevices) {