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

Commit 975a39e9 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Handle duplicate camera Id due to openLegacy support 

When HAL supports openLegacy, same camera id can be added more than
once.

Because we now use vector to store API1 compatible camera ids, make
sure no duplicate strings are added.

Test: Vendor camera app using openLegacy, Camera CTS
Bug: 110815837
Change-Id: I327744e102cc75929ebcdf51661f9f4ec7f3acf9
parent 5101a257

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −1
Original line number Diff line number Diff line
@@ -631,8 +631,13 @@ status_t CameraProviderManager::ProviderInfo::addDevice(const std::string& name, 


    mUniqueCameraIds.insert(id);

    if (isAPI1Compatible) {

        // addDevice can be called more than once for the same camera id if HAL

        // supports openLegacy.

        if (std::find(mUniqueAPI1CompatibleCameraIds.begin(), mUniqueAPI1CompatibleCameraIds.end(),

                id) == mUniqueAPI1CompatibleCameraIds.end()) {

            mUniqueAPI1CompatibleCameraIds.push_back(id);

        }

    }



    if (parsedId != nullptr) {

        *parsedId = id;