License property for company_name should come from device on android

The company_name was hardcoded in the CDM as "Google" for all devices.
On Android, it needs to come from the ro.product.manufacturer system
property.

bug: 9074091

This is a merge of https://widevine-internal-review.googlesource.com/#/c/5730/
from the Widevine CDM repository.

Change-Id: Ia3ae82abf350c32ba8b4d05b59e95361927dea40
This commit is contained in:
Jeff Tinker
2013-05-21 15:20:58 -07:00
parent 32d61899a2
commit 418f4b0e60
3 changed files with 10 additions and 4 deletions

View File

@@ -19,6 +19,10 @@ namespace {
namespace wvcdm {
bool Properties::GetCompanyName(std::string& company_name) {
return GetAndroidProperty("ro.product.manufacturer", company_name);
}
bool Properties::GetModelName(std::string& model_name) {
return GetAndroidProperty("ro.product.model", model_name);
}