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

Commit e2ac241a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply cosmetic changes" into main

parents dec8ecd4 0402658d

automotive/evs/aidl/impl/default/src/EvsCamera.cpp

+2 −1
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ ndk::ScopedAStatus EvsCamera::stopVideoStream() { 
        }



        if ((!preVideoStreamStop_locked(status, lck) || !stopVideoStreamImpl_locked(status, lck) ||

             !postVideoStreamStop_locked(status, lck)) && !status.isOk()) {

             !postVideoStreamStop_locked(status, lck)) &&

            !status.isOk()) {

            needShutdown = true;

        }

    }

automotive/evs/aidl/impl/default/src/EvsVideoEmulatedCamera.cpp

+5 −3
Original line number Diff line number Diff line
@@ -501,7 +501,9 @@ bool EvsVideoEmulatedCamera::postVideoStreamStop_locked(ndk::ScopedAStatus& stat 
        return false;

    }



    EvsEventDesc event = { .aType = EvsEventType::STREAM_STOPPED, };

    EvsEventDesc event = {

            .aType = EvsEventType::STREAM_STOPPED,

    };

    if (auto result = mStream->notify(event); !result.isOk()) {

        LOG(WARNING) << "Failed to notify the end of the stream.";

    }

automotive/evs/aidl/impl/default/tests/EvsCameraStateTest.cpp

+1 −1

File changed.

Contains only whitespace changes.