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

Commit c9bf5e9f 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

Change-Id: Idd03844e0d6f6552d3e55f5636acdfd119d6d339
parents e0c8a8c8 d6b8ceff

services/camera/libcameraservice/CameraFlashlight.cpp

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

    status_t res;





    std::vector<String8> cameraIds;

    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());

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

    cameraIds.resize(numberOfCameras);

    cameraIds.resize(numberOfCameras);

    // No module, must be provider

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




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

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

            // notify torch unavailable for all cameras with a flash

            // 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());

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

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

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

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

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




    if (isBackwardCompatibleMode(cameraId)) {

    if (isBackwardCompatibleMode(cameraId)) {

        // notify torch available for all cameras with a flash

        // 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());

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

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

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

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

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