diff options
| author | Gloria Wang <gwang@google.com> | 2011-02-07 11:41:11 -0800 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-02-07 15:10:33 -0800 |
| commit | 889b340ec736a9d3e3e690256d305cc8740f0c4b (patch) | |
| tree | fab2bdfdc9621b051923b744065f8f0331b770c1 /include | |
| parent | 802da7bc462f6f9df6e681cc75c51dc0a056a4a1 (diff) | |
| download | frameworks_av-889b340ec736a9d3e3e690256d305cc8740f0c4b.zip frameworks_av-889b340ec736a9d3e3e690256d305cc8740f0c4b.tar.gz frameworks_av-889b340ec736a9d3e3e690256d305cc8740f0c4b.tar.bz2 | |
- Do not use global DrmManagerClient
- Release the DrmManagerClient and DecryptHandle in DataSource
Fix for bug 3429811
Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/DataSource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/FileSource.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h index d4f1733..f95e56a 100644 --- a/include/media/stagefright/DataSource.h +++ b/include/media/stagefright/DataSource.h @@ -75,7 +75,7 @@ public: static void RegisterDefaultSniffers(); // for DRM - virtual DecryptHandle* DrmInitialization(DrmManagerClient *client) { + virtual DecryptHandle* DrmInitialization() { return NULL; } virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {}; diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h index 72a0403..51a4343 100644 --- a/include/media/stagefright/FileSource.h +++ b/include/media/stagefright/FileSource.h @@ -38,7 +38,7 @@ public: virtual status_t getSize(off64_t *size); - virtual DecryptHandle* DrmInitialization(DrmManagerClient *client); + virtual DecryptHandle* DrmInitialization(); virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client); |