Add feature flag to change the CDM version to 18.0.2
[ Merge of http://go/wvgerrit/191139 ] Adding an initial flag that include identifiable differences when the feature is enabled or disabled. This is the same commit as ag/25837302. It was reverted due to memory size issues. A follow on CL will address that issue to ease review. Bug: 311951236 Test: WVTS tests Change-Id: I995fb8f4158b3529c2d19a2ee5fd8beec0019f7c
This commit is contained in:
@@ -12,11 +12,15 @@
|
||||
#include <android-base/properties.h>
|
||||
#include <android/sysprop/WidevineProperties.sysprop.h>
|
||||
|
||||
#include <com_android_mediadrm_widevine_flags.h>
|
||||
|
||||
#include "log.h"
|
||||
#include "wv_android_constants.h"
|
||||
#include "widevine_apex_info.h"
|
||||
|
||||
using namespace android::sysprop;
|
||||
|
||||
namespace mediadrm_flags = com::android::mediadrm::widevine::flags;
|
||||
namespace {
|
||||
|
||||
const char kBasePathPrefix[] = "/data/vendor/mediadrm/IDM";
|
||||
@@ -146,7 +150,11 @@ bool Properties::GetWVCdmVersion(std::string* version) {
|
||||
}
|
||||
#endif
|
||||
|
||||
*version = kWVAndroidCdmVersion + apex_version;
|
||||
if (mediadrm_flags::update_cdm_version_to_18_0_2()) {
|
||||
*version = kWVAndroidCdmVersion_18_0_2 + apex_version;
|
||||
} else {
|
||||
*version = kWVAndroidCdmVersion_18_0_1 + apex_version;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user