Merge "camera: add latest parameters to dumpsys for api1 cameras" into lmp-dev (e293c71c) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/CameraClient.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,16 @@ status_t CameraClient::dump(int fd, const Vector<String16>& args) {
		mClientPid);
		len = (len > SIZE - 1) ? SIZE - 1 : len;
		write(fd, buffer, len);

		len = snprintf(buffer, SIZE, "Latest set parameters:\n");
		len = (len > SIZE - 1) ? SIZE - 1 : len;
		write(fd, buffer, len);

		mLatestSetParameters.dump(fd, args);

		const char *enddump = "\n\n";
		write(fd, enddump, strlen(enddump));

		return mHardware->dump(fd, args);
		}

		@@ -550,6 +560,7 @@ status_t CameraClient::setParameters(const String8& params) {
		status_t result = checkPidAndHardware();
		if (result != NO_ERROR) return result;

		mLatestSetParameters = CameraParameters(params);
		CameraParameters p(params);
		return mHardware->setParameters(p);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,9 @@ private:
		// of the original one), we allocate mPreviewBuffer and reuse it if possible.
		sp<MemoryHeapBase> mPreviewBuffer;

		// Debugging information
		CameraParameters mLatestSetParameters;

		// We need to avoid the deadlock when the incoming command thread and
		// the CameraHardwareInterface callback thread both want to grab mLock.
		// An extra flag is used to tell the callback thread that it should stop