am 4fe8875d: am 3f2bf742: am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev

* commit '4fe8875d14ae454b52779fe8c8d40b243be79187':
  [WVDRM] Fix effectively-unlimited memory usage
This commit is contained in:
John "Juce" Bruce
2012-10-04 12:28:31 -07:00
committed by Android Git Automerger

View File

@@ -640,10 +640,12 @@ void WVMExtractorImpl::setUID(uid_t uid)
size_t WVMExtractorImpl::getStreamCacheSize() const
{
char value[PROPERTY_VALUE_MAX];
snprintf(value, sizeof(value), "%d", kDefaultStreamCacheSize);
property_get("ro.com.widevine.cachesize", value, NULL);
return atol(value);
if (property_get("ro.com.widevine.cachesize", value, NULL) > 0) {
return atol(value);
} else {
return kDefaultStreamCacheSize;
}
}
status_t WVMExtractorImpl::getError() {