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. Bug: 311951236 Test: WVTS tests Change-Id: I57a8e05d3b7c0cb6b43cbef022b436330985fe11
This commit is contained in:
@@ -11,7 +11,8 @@ namespace wvcdm {
|
||||
|
||||
// Note: If you change this, make sure you also change
|
||||
// https://developers.google.com/widevine/drm/client/oemcrypto/compatibility
|
||||
static const std::string kWVAndroidCdmVersion = "18.0.0";
|
||||
static const std::string kWVAndroidCdmVersion_18_0_1 = "18.0.1";
|
||||
static const std::string kWVAndroidCdmVersion_18_0_2 = "18.0.2";
|
||||
|
||||
} // namespace wvcdm
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -75,6 +75,7 @@ LOCAL_SHARED_LIBRARIES := \
|
||||
libssl \
|
||||
libstagefright_foundation \
|
||||
libutils \
|
||||
wv_media_drm_flags_c_lib \
|
||||
|
||||
LOCAL_CFLAGS += -DUNIT_TEST
|
||||
|
||||
|
||||
Reference in New Issue
Block a user