Move the CDM version string to a header file
[ Merge of http://go/wvgerrit/95943 ] The CDM version for android is now defined in a platform specific header file. A check for version number match has been removed from integration tests as it will always be true. We will still get a notification to change the CDM version when the Android OS version gets updated. Bug: 151663718 Test: WV unit/integration tests Change-Id: I96bac87186e30a709585514be7f338ad2209cdf6
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include <android-base/properties.h>
|
||||
|
||||
#include "log.h"
|
||||
#include "wv_android_constants.h"
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -21,8 +22,6 @@ const char kL2Dir[] = "/L2/";
|
||||
const char kL3Dir[] = "/L3/";
|
||||
const char kFactoryKeyboxPath[] = "/factory/wv.keys";
|
||||
|
||||
const char kWVCdmVersion[] = "16.0.0";
|
||||
|
||||
bool GetAndroidProperty(const char* key, std::string* value) {
|
||||
if (!key) {
|
||||
LOGW("GetAndroidProperty: Invalid property key parameter");
|
||||
@@ -109,7 +108,7 @@ bool Properties::GetWVCdmVersion(std::string* version) {
|
||||
LOGW("Properties::GetWVCdmVersion: Invalid parameter");
|
||||
return false;
|
||||
}
|
||||
*version = kWVCdmVersion;
|
||||
*version = kWVAndroidCdmVersion;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user