widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace OS Version with Widevine Version

Browse Source 
(This is a merge of http://go/wvgerrit/13813)

Removes the OS Version property which was only ever implemented on
Android to appease Netflix and never actually used by them. Adds,
instead, a Widevine library version property. Also adds
implementations of this function for both Android and CE Devices.

For Android, the version number is starting at 3.0.0-android, to
reflect that this is the third major revision of the Widevine CDM in
Android.

For CE Devices, the version number is not changing from its current
value (2.2.0) but is gaining a "-ce" on the end in order to
differentiate it from the Android version number.

Bug: 18376638
Change-Id: Ifb3fa0d62631b45d9e91a6a53bcab3be38763d3a
This commit is contained in:
John "Juce" Bruce
2015-04-09 18:53:49 -07:00
parent 3ff106f86a
commit b0b11bc534
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -18,6 +18,8 @@ const char kL2Dir[] = "/L2/";
const char kL3Dir[] = "/L3/";
const char kFactoryKeyboxPath[] = "/factory/wv.keys";
const char kWVCdmVersion[] = "v3.0.0-android";
bool GetAndroidProperty(const char* key, std::string* value) {
char val[PROPERTY_VALUE_MAX];
if (!key) {
@@ -88,12 +90,13 @@ bool Properties::GetBuildInfo(std::string* build_info) {
return GetAndroidProperty("ro.build.fingerprint", build_info);
}
bool Properties::GetOsVersion(std::string* os_version) {
if (!os_version) {
LOGW("Properties::GetOsVersion: Invalid parameter");
bool Properties::GetWVCdmVersion(std::string* version) {
if (!version) {
LOGW("Properties::GetWVCdmVersion: Invalid parameter");
return false;
}
return GetAndroidProperty("ro.build.version.release", os_version);
*version = kWVCdmVersion;
return true;
}
bool Properties::GetDeviceFilesBasePath(CdmSecurityLevel security_level,