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

Commit ec30c30b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CameraHidlTest" am: eb86f93f am: efba7244 am: 22557982 am: 5b4752b8 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771029

Change-Id: Idc9872f8016f2559bf840f686c1ad5b6e88e6402
parents b5a07507 5b4752b8

camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp

+3 −1
Original line number Diff line number Diff line
@@ -450,7 +450,9 @@ Return<Status> LegacyCameraProviderImpl_2_4::setCallback( 
        const sp<ICameraProviderCallback>& callback) {

    Mutex::Autolock _l(mCbLock);

    mCallbacks = callback;



    if (mCallbacks == nullptr) {

        return Status::OK;

    }

    // Add and report all presenting external cameras.

    for (auto const& statusPair : mCameraStatusMap) {

        int id = std::stoi(statusPair.first);