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

Commit 7e3c19fb authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if...

Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization failed in the parent class ctor CameraSource::CameraSource."
parents 87b009de 9bb976e1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ protected:
    virtual void dataCallbackTimestamp(int64_t timestampUs, int32_t msgType,
            const sp<IMemory> &data);

    void releaseCamera();

private:
    friend class CameraSourceListener;

@@ -233,7 +235,6 @@ private:
                    int32_t frameRate);

    void stopCameraRecording();
    void releaseCamera();
    status_t reset();

    CameraSource(const CameraSource &);
+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ CameraSourceTimeLapse::CameraSourceTimeLapse(
    mVideoWidth = videoSize.width;
    mVideoHeight = videoSize.height;

    if (!trySettingVideoSize(videoSize.width, videoSize.height)) {
    if (OK == mInitCheck && !trySettingVideoSize(videoSize.width, videoSize.height)) {
        releaseCamera();
        mInitCheck = NO_INIT;
    }