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

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

Merge "Revert "Fix supportsNonblockingRead""

parents d975119d df72e61b
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ struct MediaTrack
    virtual status_t read(
            MediaBufferBase **buffer, const ReadOptions *options = NULL) = 0;

    // Returns true if |read| supports nonblocking option, otherwise false.
    // |readMultiple| if supported, always allows the nonblocking option.
    virtual bool supportNonblockingRead() {
        return false;
    }

    virtual ~MediaTrack();

private:
+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ status_t RemoteMediaSource::read(
    return mSource->read(buffer, reinterpret_cast<const MediaSource::ReadOptions*>(options));
}

bool RemoteMediaSource::supportNonblockingRead() {
    return mSource->supportNonblockingRead();
}

status_t RemoteMediaSource::pause() {
    return ERROR_UNSUPPORTED;
}
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public:
    virtual status_t read(
            MediaBufferBase **buffer,
            const MediaSource::ReadOptions *options = NULL);
    virtual bool supportNonblockingRead();
    virtual status_t pause();
    virtual status_t setStopTimeUs(int64_t stopTimeUs);