Merge "Fix AUPT: Native crash in /system/bin/mediaserver" into lmp-preview-dev

This commit is contained in:
Jeff Tinker
2014-06-02 17:21:39 +00:00
committed by Android (Google) Code Review

View File

@@ -477,6 +477,11 @@ void WVMMediaSource::DecryptCallback(WVEsSelector esType, void* input, void* out
DecryptContext &context = source->getDecryptContext();
uint32_t copied = length;
if (!context.mMediaBuf->data()) {
ALOGE("WVMMediaSource::DecryptCallback - no media buffer!");
return;
}
if (clientContext->getCryptoPluginMode()) {
// just determine crypto unit boundaries
if (key) {