From 19a9fef6d2970a615f4f33025f9141e44b7c9f34 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 27 Feb 2014 13:20:07 -0800
Subject: Don't crash on remote read error, just return

Change-Id: I35a2af255f55e008d64142ed0eceb6e83473d630
---
 media/libmedia/IMediaHTTPConnection.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'media/libmedia/IMediaHTTPConnection.cpp')

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();
 
-- 
cgit v1.1