Merge "Revert "CameraService: Add path to update vendorTag info upon HA..."" (d8835ab4) · Commits · e / os / android_frameworks_av

camera/aidl/android/hardware/ICameraService.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -144,11 +144,6 @@ interface ICameraService
		*/
		VendorTagDescriptor getCameraVendorTagDescriptor();

		/**
		* Setup vendor tags for camera providers
		*/
		void setUpVendorTags();

		/**
		* Retrieve the vendor tag descriptor cache which can have multiple vendor
		* providers.

+0 −16

Original line number	Diff line number	Diff line
		@@ -852,22 +852,6 @@ String8 CameraService::getFormattedCurrentTime() {
		return String8(formattedTime);
		}

		Status CameraService::setUpVendorTags() {
		ATRACE_CALL();

		Mutex::Autolock lock(mServiceLock);

		Status ret = Status::ok();

		if (mCameraProviderManager != nullptr) {
		mCameraProviderManager->setUpVendorTags();
		} else {
		ret = STATUS_ERROR(ERROR_DISCONNECTED, "CameraProviderManager is NULL");
		}

		return ret;
		}

		Status CameraService::getCameraVendorTagDescriptor(
		/out/
		hardware::camera2::params::VendorTagDescriptor* desc) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,6 @@ public:
		virtual binder::Status getCameraVendorTagCache(
		/out/
		hardware::camera2::params::VendorTagDescriptorCache* cache);
		virtual binder::Status setUpVendorTags();

		virtual binder::Status connect(const sp<hardware::ICameraClient>& cameraClient,
		int32_t cameraId, const String16& clientPackageName,