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

Commit 622235c2 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Support all API1 compatible camera devices" into pi-dev am: bb2eb09a

am: 6ae3919d

Change-Id: Idb20a1a97e3b3911b36d092d4ca4f8b6d33d6b0c
parents d5119ec5 6ae3919d
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ namespace {
const std::string kLegacyProviderName("legacy/0");
const std::string kExternalProviderName("external/0");

// Slash-separated list of provider types to consider for use via the old camera API
const std::string kStandardProviderTypes("internal/legacy/external");

} // anonymous namespace

CameraProviderManager::HardwareServiceInteractionProxy
@@ -101,12 +98,10 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
    std::lock_guard<std::mutex> lock(mInterfaceMutex);
    std::vector<std::string> deviceIds;
    for (auto& provider : mProviders) {
        if (kStandardProviderTypes.find(provider->getType()) != std::string::npos) {
        for (auto& id : provider->mUniqueAPI1CompatibleCameraIds) {
            deviceIds.push_back(id);
        }
    }
    }

    std::sort(deviceIds.begin(), deviceIds.end(),
            [](const std::string& a, const std::string& b) -> bool {