diff options
| author | Marco Nelissen <marcone@google.com> | 2014-02-27 22:03:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-27 22:03:50 +0000 |
| commit | 484b4cd809aa46a54791d5c82a78d0f8aac895cf (patch) | |
| tree | f729614ef60d6122ad8796751c1aea9ad2afa749 /media | |
| parent | 8897759002677a7072a51a7f0b7cc63761c5f2d4 (diff) | |
| parent | 19a9fef6d2970a615f4f33025f9141e44b7c9f34 (diff) | |
| download | frameworks_av-484b4cd809aa46a54791d5c82a78d0f8aac895cf.zip frameworks_av-484b4cd809aa46a54791d5c82a78d0f8aac895cf.tar.gz frameworks_av-484b4cd809aa46a54791d5c82a78d0f8aac895cf.tar.bz2 | |
Merge "Don't crash on remote read error, just return"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/IMediaHTTPConnection.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp index 22c470a..7e26ee6 100644 --- a/media/libmedia/IMediaHTTPConnection.cpp +++ b/media/libmedia/IMediaHTTPConnection.cpp @@ -95,7 +95,10 @@ struct BpMediaHTTPConnection : public BpInterface<IMediaHTTPConnection> { data.writeInt32(size); status_t err = remote()->transact(READ_AT, data, &reply); - CHECK_EQ(err, (status_t)OK); + if (err != OK) { + ALOGE("remote readAt failed"); + return UNKNOWN_ERROR; + } int32_t exceptionCode = reply.readExceptionCode(); |