Merge "Camera: fix API1 HAL3 path" (a6edcbb2) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/Camera2Client.cpp

+11 −2

Original line number	Diff line number	Diff line
		@@ -68,13 +68,22 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService,
		mLegacyMode = legacyMode;
		}

		status_t Camera2Client::initialize(CameraModule *module)
		status_t Camera2Client::initialize(CameraModule *module) {
		return initializeImpl(module);
		}

		status_t Camera2Client::initialize(sp<CameraProviderManager> manager) {
		return initializeImpl(manager);
		}

		template<typename TProviderPtr>
		status_t Camera2Client::initializeImpl(TProviderPtr providerPtr)
		{
		ATRACE_CALL();
		ALOGV("%s: Initializing client for camera %d", __FUNCTION__, mCameraId);
		status_t res;

		res = Camera2ClientBase::initialize(module);
		res = Camera2ClientBase::initialize(providerPtr);
		if (res != OK) {
		return res;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,8 @@ public:

		virtual ~Camera2Client();

		status_t initialize(CameraModule *module);
		virtual status_t initialize(CameraModule *module) override;
		virtual status_t initialize(sp<CameraProviderManager> manager) override;

		virtual status_t dump(int fd, const Vector<String16>& args);

		@@ -219,6 +220,9 @@ private:

		// Video snapshot jpeg size overriding helper function
		status_t overrideVideoSnapshotSize(Parameters &params);

		template<typename TProviderPtr>
		status_t initializeImpl(TProviderPtr providerPtr);
		};

		}; // namespace android

+2 −0

Original line number	Diff line number	Diff line
		@@ -917,6 +917,8 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) {
		} else {
		allowZslMode = true;
		}
		// TODO (b/34131351): turn ZSL back on after fixing the issue
		allowZslMode = false;

		ALOGI("%s: allowZslMode: %d slowJpegMode %d", __FUNCTION__, allowZslMode, slowJpegMode);