commit ea44f41bb142555e747cc11382296e94af99d312
author Ronghua Wu <ronghuawu@google.com> Mon Apr 20 23:30:31 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 23:30:33 2015 +0000
tree 462f4b788506dfa5fcdb38533359fd27a380062a
parent a7346034d597c18b63bc63fdfea8360f8b6c1283
parent e4237177a4a3eea059cd74247b2d770d301a8230

Merge "media: ignore the result of linkToDeath, which can fail if called from same process."

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5ae79e6..93864e4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -236,11 +236,7 @@
         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*/) {