diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-22 14:55:16 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-06-22 16:36:24 -0700 |
| commit | b7e7bdfe784959ac8615851c2741eb9518a5afcf (patch) | |
| tree | 4111a7f161fc225c4396a62192828168bfa3833c /drm/common | |
| parent | 8969d9924c662ab4cdacc342bbdc33756db730be (diff) | |
| download | frameworks_base-b7e7bdfe784959ac8615851c2741eb9518a5afcf.zip frameworks_base-b7e7bdfe784959ac8615851c2741eb9518a5afcf.tar.gz frameworks_base-b7e7bdfe784959ac8615851c2741eb9518a5afcf.tar.bz2 | |
- Add two sanity checks.
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.
Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
Diffstat (limited to 'drm/common')
| -rw-r--r-- | drm/common/DrmSupportInfo.cpp | 4 | ||||
| -rw-r--r-- | drm/common/IDrmManagerService.cpp | 1 |
2 files changed, 5 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); diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index 458f1b6..2d8e877 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -107,6 +107,7 @@ static void clearDecryptHandle(DecryptHandle* handle) { handle->decryptInfo = NULL; } handle->copyControlVector.clear(); + handle->extendedData.clear(); } int BpDrmManagerService::addUniqueId(int uniqueId) { |