summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-12-15 22:41:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-15 22:41:38 +0000
commitd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e (patch)
tree67ff24ec2416909682edb9b160da2ae2ec1752ad /include
parentdc039672b8fad7746200ecc36304d0e85db4f367 (diff)
parent06f9952190357426445344090b4e20b8758a118a (diff)
downloadframeworks_av-d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e.zip
frameworks_av-d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e.tar.gz
frameworks_av-d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e.tar.bz2
am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-dev
* commit '06f9952190357426445344090b4e20b8758a118a': 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,