Merge "Camera: Avoid flushing uninitialized devices" (f7f46312) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -2014,6 +2014,13 @@ status_t Camera3Device::flush(int64_t *frameNumber) {

		{
		Mutex::Autolock l(mLock);

		// b/116514106 "disconnect()" can get called twice for the same device. The
		// camera device will not be initialized during the second run.
		if (mStatus == STATUS_UNINITIALIZED) {
		return OK;
		}

		mRequestThread->clear(/out/frameNumber);
		}