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

Commit 4f9ad3e8 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: consider all cameras in flash light control" am: 1635b6c2 am: d6b8ceff 

am: c9bf5e9f

Change-Id: I74eb1861495ccb3cc834be86902c8f0842dee106
parents d7d6c10c c9bf5e9f

services/camera/libcameraservice/CameraFlashlight.cpp

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ status_t CameraFlashlight::findFlashUnits() { 
    status_t res;



    std::vector<String8> cameraIds;

    std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();

    std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();

    int numberOfCameras = static_cast<int>(ids.size());

    cameraIds.resize(numberOfCameras);

    // No module, must be provider
@@ -217,7 +217,7 @@ status_t CameraFlashlight::prepareDeviceOpen(const String8& cameraId) { 


        if (mOpenedCameraIds.size() == 0) {

            // notify torch unavailable for all cameras with a flash

            std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();

            std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();

            int numCameras = static_cast<int>(ids.size());

            for (int i = 0; i < numCameras; i++) {

                String8 id8(ids[i].c_str());
@@ -263,7 +263,7 @@ status_t CameraFlashlight::deviceClosed(const String8& cameraId) { 


    if (isBackwardCompatibleMode(cameraId)) {

        // notify torch available for all cameras with a flash

        std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();

        std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();

        int numCameras = static_cast<int>(ids.size());

        for (int i = 0; i < numCameras; i++) {

            String8 id8(ids[i].c_str());