summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-04-20 16:07:00 -0700
committerRonghua Wu <ronghuawu@google.com>2015-04-20 16:07:00 -0700
commite4237177a4a3eea059cd74247b2d770d301a8230 (patch)
treee76cabb4a679cb12d93b11ac07087a5136f8e6c1 /media
parentf2326ac96366ec4d05f470cc4a0b407e7805bab7 (diff)
downloadframeworks_av-e4237177a4a3eea059cd74247b2d770d301a8230.zip
frameworks_av-e4237177a4a3eea059cd74247b2d770d301a8230.tar.gz
frameworks_av-e4237177a4a3eea059cd74247b2d770d301a8230.tar.bz2
media: ignore the result of linkToDeath, which can fail if called from same process.
Bug: 19620911 Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MediaCodec.cpp6
1 files changed, 1 insertions, 5 deletions
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*/) {