Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48ae9578 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal
Browse files

Revert "CameraService: Add path to update vendorTag info upon HA..." 

Revert "CameraManager: Add path to update vendorTag info upon HA..."

Revert submission 18129735-b181579423

Reason for revert: Causing HWAddressSanitizer bug
Reverted Changes:
I8d8c00159:CameraManager: Add path to update vendorTag info u...
I01212f4c6:CameraService: Add path to update vendorTag info u...
Bug: 231526212
Change-Id: I08db0ad4e68ab2c9212fe66b387cd49f91584064
parent e0e349b2

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.

services/camera/libcameraservice/CameraService.cpp

+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) {

services/camera/libcameraservice/CameraService.h

+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,