am bd3e2e03: camera2: Fix segfault when using null availability listener (a6ca0acf) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -655,6 +655,11 @@ status_t CameraService::addListener(
		const sp<ICameraServiceListener>& listener) {
		ALOGV("%s: Add listener %p", __FUNCTION__, listener.get());

		if (listener == 0) {
		ALOGE("%s: Listener must not be null", __FUNCTION__);
		return BAD_VALUE;
		}

		Mutex::Autolock lock(mServiceLock);

		Vector<sp<ICameraServiceListener> >::iterator it, end;
		@@ -683,6 +688,11 @@ status_t CameraService::removeListener(
		const sp<ICameraServiceListener>& listener) {
		ALOGV("%s: Remove listener %p", __FUNCTION__, listener.get());

		if (listener == 0) {
		ALOGE("%s: Listener must not be null", __FUNCTION__);
		return BAD_VALUE;
		}

		Mutex::Autolock lock(mServiceLock);

		Vector<sp<ICameraServiceListener> >::iterator it;