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

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

Merge "Fix CameraHidlTest" am: eb86f93f

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

Change-Id: Ie6c744bdd5cd3ffa36647fa1fbe4a985a89916e3
parents 83677af0 eb86f93f
Loading
Loading
Loading
Loading
+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);