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

Commit b566e2ed authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge \\"Only read timestamps from HAL if not FastCapture\\" into nyc-mr1-dev am: b5aac433

am: cbbb9a50

Change-Id: Ic983502e4b1802208deb3bd85cd537caa45314c9
parents e18d7415 cbbb9a50
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -6246,7 +6246,8 @@ reacquire_wakelock:
        mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = systemTime();

        // Update server timestamp with kernel stats
        if (mInput->stream->get_capture_position != nullptr) {
        if (mInput->stream->get_capture_position != nullptr
                && mPipeSource.get() == nullptr /* don't obtain for FastCapture, could block */) {
            int64_t position, time;
            int ret = mInput->stream->get_capture_position(mInput->stream, &position, &time);
            if (ret == NO_ERROR) {