From e4237177a4a3eea059cd74247b2d770d301a8230 Mon Sep 17 00:00:00 2001
From: Ronghua Wu <ronghuawu@google.com>
Date: Mon, 20 Apr 2015 16:07:00 -0700
Subject: media: ignore the result of linkToDeath, which can fail if called
 from same process.

Bug: 19620911
Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
---
 media/libstagefright/MediaCodec.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'media/libstagefright/MediaCodec.cpp')

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 40818f9..eedd7f4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -236,11 +236,7 @@ void MediaCodec::ResourceManagerServiceProxy::init() {
         ALOGE("Failed to get ResourceManagerService");
         return;
     }
-    if (IInterface::asBinder(mService)->linkToDeath(this) != OK) {
-        mService.clear();
-        ALOGE("Failed to linkToDeath to ResourceManagerService.");
-        return;
-    }
+    IInterface::asBinder(mService)->linkToDeath(this);
 }
 
 void MediaCodec::ResourceManagerServiceProxy::binderDied(const wp<IBinder>& /*who*/) {
-- 
cgit v1.1