diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-04-25 00:41:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 00:41:41 +0000 |
| commit | fdec2c1b19e36bb0b9fb7f4f7561ad63e904a560 (patch) | |
| tree | f6dca8da5a00a0c3fd3f5a7fe235edae53e3e28a /media/libmediaplayerservice/Drm.h | |
| parent | ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681 (diff) | |
| parent | 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be (diff) | |
| download | frameworks_av-fdec2c1b19e36bb0b9fb7f4f7561ad63e904a560.zip frameworks_av-fdec2c1b19e36bb0b9fb7f4f7561ad63e904a560.tar.gz frameworks_av-fdec2c1b19e36bb0b9fb7f4f7561ad63e904a560.tar.bz2 | |
Merge "Lock drm plugin API calls globally, not per MediaDrm instance"
Diffstat (limited to 'media/libmediaplayerservice/Drm.h')
| -rw-r--r-- | media/libmediaplayerservice/Drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h index c4013b8..056723c 100644 --- a/media/libmediaplayerservice/Drm.h +++ b/media/libmediaplayerservice/Drm.h @@ -143,7 +143,7 @@ struct Drm : public BnDrm, virtual void binderDied(const wp<IBinder> &the_late_who); private: - mutable Mutex mLock; + static Mutex mLock; status_t mInitCheck; |