diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-23 09:33:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-23 09:33:11 -0700 |
| commit | b59f67761155cfa696e9f7cadb83e4f645a55212 (patch) | |
| tree | 615d6b0a0757158346b12364cb61a666e771f002 /drm/common/DrmSupportInfo.cpp | |
| parent | db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08 (diff) | |
| parent | b7e7bdfe784959ac8615851c2741eb9518a5afcf (diff) | |
| download | frameworks_base-b59f67761155cfa696e9f7cadb83e4f645a55212.zip frameworks_base-b59f67761155cfa696e9f7cadb83e4f645a55212.tar.gz frameworks_base-b59f67761155cfa696e9f7cadb83e4f645a55212.tar.bz2 | |
Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle."
Diffstat (limited to 'drm/common/DrmSupportInfo.cpp')
| -rw-r--r-- | drm/common/DrmSupportInfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drm/common/DrmSupportInfo.cpp b/drm/common/DrmSupportInfo.cpp index 3dee435..5400bdd 100644 --- a/drm/common/DrmSupportInfo.cpp +++ b/drm/common/DrmSupportInfo.cpp @@ -43,6 +43,10 @@ bool DrmSupportInfo::operator==(const DrmSupportInfo& drmSupportInfo) const { } bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const { + if (String8("") == mimeType) { + return false; + } + for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) { const String8 item = mMimeTypeVector.itemAt(i); |