diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-08-28 16:40:41 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2013-08-28 16:40:41 -0700 |
| commit | ee7e77d55d510725a314d8ed36dc730c21af6173 (patch) | |
| tree | 02b7cfa93dd77e7927b67cc6d85d865e3e6bd0c3 /media/libmediaplayerservice | |
| parent | 8271f1a2225a34a0748624786392213a746c56d7 (diff) | |
| download | frameworks_av-ee7e77d55d510725a314d8ed36dc730c21af6173.zip frameworks_av-ee7e77d55d510725a314d8ed36dc730c21af6173.tar.gz frameworks_av-ee7e77d55d510725a314d8ed36dc730c21af6173.tar.bz2 | |
fix MediaDrm.isCryptoSchemeSupported(uuid)
1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used
b/10528466
Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp index 4b527d0..eebcb79 100644 --- a/media/libmediaplayerservice/Drm.cpp +++ b/media/libmediaplayerservice/Drm.cpp @@ -222,7 +222,11 @@ bool Drm::isCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeTyp } } - return mFactory->isContentTypeSupported(mimeType); + if (mimeType != "") { + return mFactory->isContentTypeSupported(mimeType); + } + + return true; } status_t Drm::createPlugin(const uint8_t uuid[16]) { |