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

Merge "Move the CDM version string to a header file" into rvc-dev

Browse Source
This commit is contained in:
Rahul Frias
2020-03-20 01:59:36 +00:00
committed by Android (Google) Code Review
parent 88934aa322 ca39586f8d
commit 8c1f8f1469
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/cdm/include/wv_android_constants.h Normal file
View File

@@ -0,0 +1,12 @@
#ifndef WVCDM_WV_ANDROID_CONSTANTS_H_
#define WVCDM_WV_ANDROID_CONSTANTS_H_
#include <string>
namespace wvcdm {
static const std::string kWVAndroidCdmVersion = "16.0.0";
} // namespace wvcdm
#endif // WVCDM_WV_ANDROID_CONSTANTS_H_

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

@@ -12,6 +12,7 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#include "log.h" #include "log.h"
#include "wv_android_constants.h"
namespace { namespace {
@@ -21,8 +22,6 @@ const char kL2Dir[] = "/L2/";
const char kL3Dir[] = "/L3/"; const char kL3Dir[] = "/L3/";
const char kFactoryKeyboxPath[] = "/factory/wv.keys"; const char kFactoryKeyboxPath[] = "/factory/wv.keys";
const char kWVCdmVersion[] = "16.0.0";
bool GetAndroidProperty(const char* key, std::string* value) { bool GetAndroidProperty(const char* key, std::string* value) {
if (!key) { if (!key) {
LOGW("GetAndroidProperty: Invalid property key parameter"); LOGW("GetAndroidProperty: Invalid property key parameter");
@@ -109,7 +108,7 @@ bool Properties::GetWVCdmVersion(std::string* version) {
LOGW("Properties::GetWVCdmVersion: Invalid parameter"); LOGW("Properties::GetWVCdmVersion: Invalid parameter");
return false; return false;
} }
*version = kWVCdmVersion; *version = kWVAndroidCdmVersion;
return true; return true;
} }

8
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -5646,13 +5646,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
EXPECT_STREQ("R", release_number.c_str()) EXPECT_STREQ("R", release_number.c_str())
<< "The Android version number has changed. You need to update this test " << "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in " "and also possibly update the Widevine version number in "
"properties_android.cpp."; "wv_android_constants.h";
std::string widevine_version;
ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
EXPECT_EQ("16.0.0", widevine_version)
<< "The Widevine CDM version number has changed. Did you forget to "
"update this test after changing it?";
} }
TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) { TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {