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

Commit 1d2a8a54 authored by Adrian DC's avatar Adrian DC Committed by Bruno Martins
Browse files

libcameraservice: Disable external provider for legacy HAL1 

 * The external camera provider was introduced by commit:
    Camera: listen to external camera provider
    Change-Id: I051c77d7b0fe1e0e3b3b2461e7f8da9bd91a440c

 * Enabling this on legacy HAL1 devices crashes the
    kernel video driver, while serving no purpose

 * Makes the original commit depend on the variable
    TARGET_HAS_LEGACY_CAMERA_HAL1 not being true

Change-Id: I954b550e3de848c2c315713f4340697c03878c3e
parent ff5a4705

services/camera/libcameraservice/common/CameraProviderManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ namespace { 
// Hardcoded name for the passthrough HAL implementation, since it can't be discovered via the

// service manager

const std::string kLegacyProviderName("legacy/0");

#ifndef NO_CAMERA_SERVER

const std::string kExternalProviderName("external/0");

#endif



} // anonymous namespace
@@ -69,7 +71,9 @@ status_t CameraProviderManager::initialize(wp<CameraProviderManager::StatusListe 


    // See if there's a passthrough HAL, but let's not complain if there's not

    addProviderLocked(kLegacyProviderName, /*expected*/ false);

#ifndef NO_CAMERA_SERVER

    addProviderLocked(kExternalProviderName, /*expected*/ false);

#endif



    return OK;

}