diff options
| author | Andreas Huber <andih@google.com> | 2012-09-28 00:34:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-28 00:34:13 -0700 |
| commit | 10b7722d745fb70a9becdfccac0eeb481f058ff0 (patch) | |
| tree | 3b48d69ce5f148080357d463e1f2f15bb5c3a82f /media/libmediaplayerservice/HDCP.h | |
| parent | 592364b53ddde403d6bc0db7cf5ed592f7e12dd0 (diff) | |
| parent | d398c2724c8a942961d13245a4669db0555080e4 (diff) | |
| download | frameworks_av-10b7722d745fb70a9becdfccac0eeb481f058ff0.zip frameworks_av-10b7722d745fb70a9becdfccac0eeb481f058ff0.tar.gz frameworks_av-10b7722d745fb70a9becdfccac0eeb481f058ff0.tar.bz2 | |
am d398c272: am ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
* commit 'd398c2724c8a942961d13245a4669db0555080e4':
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Diffstat (limited to 'media/libmediaplayerservice/HDCP.h')
| -rw-r--r-- | media/libmediaplayerservice/HDCP.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/HDCP.h b/media/libmediaplayerservice/HDCP.h index 4ee664d..b2fc457 100644 --- a/media/libmediaplayerservice/HDCP.h +++ b/media/libmediaplayerservice/HDCP.h @@ -19,6 +19,7 @@ #define HDCP_H_ #include <media/IHDCP.h> +#include <utils/Mutex.h> namespace android { @@ -35,6 +36,8 @@ struct HDCP : public BnHDCP { uint64_t *outInputCTR, void *outData); private: + Mutex mLock; + void *mLibHandle; HDCPModule *mHDCPModule; sp<IHDCPObserver> mObserver; |