diff options
author | Marco Nelissen <marcone@google.com> | 2015-02-18 22:57:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 22:57:42 +0000 |
commit | a7c1df10d39a8056ca755ccd77b06816c6de3225 (patch) | |
tree | d4aac4ec69928dc5667675b204b5337ff28591b6 /include/media | |
parent | 56fbb4d7bcb34af71a08cd126891afafdec217f1 (diff) | |
parent | a963dacc1b44ec80742c86ce75611eb9cfa936ea (diff) | |
download | frameworks_av-a7c1df10d39a8056ca755ccd77b06816c6de3225.zip frameworks_av-a7c1df10d39a8056ca755ccd77b06816c6de3225.tar.gz frameworks_av-a7c1df10d39a8056ca755ccd77b06816c6de3225.tar.bz2 |
am a963dacc: am 64753517: Merge "Add dumpsys info"
* commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea':
Add dumpsys info
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/foundation/AHandler.h | 7 | ||||
-rw-r--r-- | include/media/stagefright/foundation/ALooperRoster.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/AHandler.h b/include/media/stagefright/foundation/AHandler.h index b008b54..41ade77 100644 --- a/include/media/stagefright/foundation/AHandler.h +++ b/include/media/stagefright/foundation/AHandler.h @@ -19,6 +19,7 @@ #define A_HANDLER_H_ #include <media/stagefright/foundation/ALooper.h> +#include <utils/KeyedVector.h> #include <utils/RefBase.h> namespace android { @@ -27,7 +28,8 @@ struct AMessage; struct AHandler : public RefBase { AHandler() - : mID(0) { + : mID(0), + mMessageCounter(0) { } ALooper::handler_id id() const { @@ -48,6 +50,9 @@ private: mID = id; } + uint32_t mMessageCounter; + KeyedVector<uint32_t, uint32_t> mMessages; + DISALLOW_EVIL_CONSTRUCTORS(AHandler); }; diff --git a/include/media/stagefright/foundation/ALooperRoster.h b/include/media/stagefright/foundation/ALooperRoster.h index 4d76b64..a0be8eb 100644 --- a/include/media/stagefright/foundation/ALooperRoster.h +++ b/include/media/stagefright/foundation/ALooperRoster.h @@ -20,6 +20,7 @@ #include <media/stagefright/foundation/ALooper.h> #include <utils/KeyedVector.h> +#include <utils/String16.h> namespace android { @@ -42,6 +43,8 @@ struct ALooperRoster { sp<ALooper> findLooper(ALooper::handler_id handlerID); + void dump(int fd, const Vector<String16>& args); + private: struct HandlerInfo { wp<ALooper> mLooper; |