summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-12-15 22:46:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-15 22:46:53 +0000
commita683bb2a7f92b44e9b04752a8126106ce3b0ecca (patch)
tree43cf569561fda9a66de67f217e588e47bc02e738 /include
parentf1596a66a32072d8cdf7b5e877bdaea7033b761b (diff)
parentd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e (diff)
downloadframeworks_av-a683bb2a7f92b44e9b04752a8126106ce3b0ecca.zip
frameworks_av-a683bb2a7f92b44e9b04752a8126106ce3b0ecca.tar.gz
frameworks_av-a683bb2a7f92b44e9b04752a8126106ce3b0ecca.tar.bz2
am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-dev
* commit 'd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e': MediaCodecList: handle binder death
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MediaCodecList.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h
index 8605d99..c2bbe4d 100644
--- a/include/media/stagefright/MediaCodecList.h
+++ b/include/media/stagefright/MediaCodecList.h
@@ -52,6 +52,12 @@ struct MediaCodecList : public BnMediaCodecList {
static sp<IMediaCodecList> getLocalInstance();
private:
+ class BinderDeathObserver : public IBinder::DeathRecipient {
+ void binderDied(const wp<IBinder> &the_late_who __unused);
+ };
+
+ static sp<BinderDeathObserver> sBinderDeathObserver;
+
enum Section {
SECTION_TOPLEVEL,
SECTION_DECODERS,